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>
This commit is contained in:
Sage Weil
2009-11-18 16:50:41 -08:00
parent cfea1cf42b
commit 0743304d87
6 changed files with 50 additions and 139 deletions

View File

@@ -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)