[PATCH 4/8] ceph: enable creation of clients that don't need mds
in [Kernel]
|
Prev: [PATCH 2/8] ceph: refactor osdc requests creation functions
Next: [PATCH 6/8] ceph: sync ceph_fs.h with the server tree version
From: Yehuda Sadeh on 12 May 2010 19:20 Preparing grounds for rbd that doesn't need mds client. Signed-off-by: Yehuda Sadeh <yehuda(a)hq.newdream.net> --- fs/ceph/debugfs.c | 11 ++++++++--- fs/ceph/mon_client.c | 3 ++- fs/ceph/super.c | 15 ++++++++++----- fs/ceph/super.h | 2 ++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 39a2bda..6bad024 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -439,9 +439,14 @@ int ceph_debugfs_client_init(struct ceph_client *client) if (!client->debugfs_congestion_kb) goto out; - sprintf(name, "../../bdi/%s", dev_name(client->sb->s_bdi->dev)); - client->debugfs_bdi = debugfs_create_symlink("bdi", client->debugfs_dir, - name); + if (client->backing_dev_info.dev) { + sprintf(name, "../../bdi/%s", + dev_name(client->backing_dev_info.dev)); + client->debugfs_bdi = + debugfs_create_symlink("bdi", + client->debugfs_dir, + name); + } return 0; diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c index a52d68c..9b56613 100644 --- a/fs/ceph/mon_client.c +++ b/fs/ceph/mon_client.c @@ -776,7 +776,8 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg) break; case CEPH_MSG_MDS_MAP: - ceph_mdsc_handle_map(&monc->client->mdsc, msg); + if (monc->client->have_mdsc) + ceph_mdsc_handle_map(&monc->client->mdsc, msg); break; case CEPH_MSG_OSD_MAP: diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 30fa891..56fe97b 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -565,7 +565,8 @@ static void destroy_mount_args(struct ceph_mount_args *args) /* * create a fresh client instance */ -static struct ceph_client *ceph_create_client(struct ceph_mount_args *args) +struct ceph_client *ceph_create_client(struct ceph_mount_args *args, + int need_mdsc) { struct ceph_client *client; int err = -ENOMEM; @@ -620,9 +621,13 @@ static struct ceph_client *ceph_create_client(struct ceph_mount_args *args) err = ceph_osdc_init(&client->osdc, client); if (err < 0) goto fail_monc; - err = ceph_mdsc_init(&client->mdsc, client); - if (err < 0) - goto fail_osdc; + if (need_mdsc) { + err = ceph_mdsc_init(&client->mdsc, client); + if (err < 0) + goto fail_osdc; + client->have_mdsc = 1; + } + return client; fail_osdc: @@ -934,7 +939,7 @@ static int ceph_get_sb(struct file_system_type *fs_type, } /* create client (which we may/may not use) */ - client = ceph_create_client(args); + client = ceph_create_client(args, 1); if (IS_ERR(client)) { err = PTR_ERR(client); goto out_final; diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 01b640d..429f6b7 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -137,6 +137,8 @@ struct ceph_client { int min_caps; /* min caps i added */ + int have_mdsc; + struct ceph_messenger *msgr; /* messenger instance */ struct ceph_mon_client monc; struct ceph_mds_client mdsc; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |