libceph: rename ceph_client_id() -> ceph_client_gid()
It's gid / global_id in other places. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Mike Christie <mchristi@redhat.com> Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
parent
6305a3b415
commit
033268a5f0
|
@ -3758,7 +3758,7 @@ static ssize_t rbd_client_id_show(struct device *dev,
|
|||
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
|
||||
|
||||
return sprintf(buf, "client%lld\n",
|
||||
ceph_client_id(rbd_dev->rbd_client->client));
|
||||
ceph_client_gid(rbd_dev->rbd_client->client));
|
||||
}
|
||||
|
||||
static ssize_t rbd_pool_show(struct device *dev,
|
||||
|
|
|
@ -264,7 +264,7 @@ extern struct ceph_client *ceph_create_client(struct ceph_options *opt,
|
|||
void *private,
|
||||
u64 supported_features,
|
||||
u64 required_features);
|
||||
extern u64 ceph_client_id(struct ceph_client *client);
|
||||
u64 ceph_client_gid(struct ceph_client *client);
|
||||
extern void ceph_destroy_client(struct ceph_client *client);
|
||||
extern int __ceph_open_session(struct ceph_client *client,
|
||||
unsigned long started);
|
||||
|
|
|
@ -566,11 +566,11 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)
|
|||
}
|
||||
EXPORT_SYMBOL(ceph_print_client_options);
|
||||
|
||||
u64 ceph_client_id(struct ceph_client *client)
|
||||
u64 ceph_client_gid(struct ceph_client *client)
|
||||
{
|
||||
return client->monc.auth->global_id;
|
||||
}
|
||||
EXPORT_SYMBOL(ceph_client_id);
|
||||
EXPORT_SYMBOL(ceph_client_gid);
|
||||
|
||||
/*
|
||||
* create a fresh client instance
|
||||
|
@ -685,7 +685,8 @@ int __ceph_open_session(struct ceph_client *client, unsigned long started)
|
|||
return client->auth_err;
|
||||
}
|
||||
|
||||
pr_info("client%llu fsid %pU\n", ceph_client_id(client), &client->fsid);
|
||||
pr_info("client%llu fsid %pU\n", ceph_client_gid(client),
|
||||
&client->fsid);
|
||||
ceph_debugfs_client_init(client);
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue