diff options
| author | Sage Weil <sage@inktank.com> | 2012-08-19 12:29:16 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-08-20 10:03:15 -0700 |
| commit | d1c338a509cea5378df59629ad47382810c38623 (patch) | |
| tree | da12e11b8ae0df8ae424d1cef0d98eac095e2268 /net/ceph/debugfs.c | |
| parent | 6dab7ede9390d4d937cb89feca932e4fd575d2da (diff) | |
| download | linux-d1c338a509cea5378df59629ad47382810c38623.tar.gz linux-d1c338a509cea5378df59629ad47382810c38623.tar.bz2 linux-d1c338a509cea5378df59629ad47382810c38623.zip | |
libceph: delay debugfs initialization until we learn global_id
The debugfs directory includes the cluster fsid and our unique global_id.
We need to delay the initialization of the debug entry until we have
learned both the fsid and our global_id from the monitor or else the
second client can't create its debugfs entry and will fail (and multiple
client instances aren't properly reflected in debugfs).
Reported by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'net/ceph/debugfs.c')
| -rw-r--r-- | net/ceph/debugfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index 54b531a01121..38b5dc1823d4 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c @@ -189,6 +189,9 @@ int ceph_debugfs_client_init(struct ceph_client *client) snprintf(name, sizeof(name), "%pU.client%lld", &client->fsid, client->monc.auth->global_id); + dout("ceph_debugfs_client_init %p %s\n", client, name); + + BUG_ON(client->debugfs_dir); client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir); if (!client->debugfs_dir) goto out; @@ -234,6 +237,7 @@ out: void ceph_debugfs_client_cleanup(struct ceph_client *client) { + dout("ceph_debugfs_client_cleanup %p\n", client); debugfs_remove(client->debugfs_osdmap); debugfs_remove(client->debugfs_monmap); debugfs_remove(client->osdc.debugfs_file); |