summaryrefslogtreecommitdiffstats
path: root/fs/ceph/debugfs.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-11-18 16:50:41 -0800
committerSage Weil <sage@newdream.net>2009-11-20 14:24:27 -0800
commit0743304d871559cb4c7c066357de2caa60e94c2f (patch)
tree546510a84c1bda27e71a8a8229544d99f5624252 /fs/ceph/debugfs.c
parentcfea1cf42b614583c02727d5bffd5a2384e92bda (diff)
downloadlinux-0743304d871559cb4c7c066357de2caa60e94c2f.tar.bz2
ceph: fix debugfs entry, simplify fsid checks
We may first learn our fsid from any of the mon, osd, or mds maps (whichever the monitor sends first). Consolidate checks in a single helper. Initialize the client debugfs entry then, since we need the fsid (and global_id) for the directory name. Also remove dead mount code. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/debugfs.c')
-rw-r--r--fs/ceph/debugfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index 9b2020696680..b90fc3e1ff70 100644
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -7,6 +7,8 @@
#include "super.h"
#include "mds_client.h"
+#include "mon_client.h"
+#include "auth.h"
#ifdef CONFIG_DEBUG_FS
@@ -335,7 +337,7 @@ int ceph_debugfs_client_init(struct ceph_client *client)
char name[80];
snprintf(name, sizeof(name), FSID_FORMAT ".client%lld",
- PR_FSID(&client->monc.monmap->fsid), client->whoami);
+ PR_FSID(&client->fsid), client->monc.auth->global_id);
client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir);
if (!client->debugfs_dir)