From: Yehuda Sadeh <[email protected]> Preparing grounds for rbd that doesn't need mds client.
Signed-off-by: Yehuda Sadeh <[email protected]> Signed-off-by: Sage Weil <[email protected]> --- fs/ceph/debugfs.c | 11 ++++++++--- fs/ceph/mon_client.c | 3 ++- fs/ceph/super.c | 18 ++++++++++++------ fs/ceph/super.h | 2 ++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 360c4f2..02536f7 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -441,9 +441,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 b2a5a3e..816a9ce 100644 --- a/fs/ceph/mon_client.c +++ b/fs/ceph/mon_client.c @@ -923,7 +923,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 9922628..ff295c9 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -620,7 +620,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; @@ -674,9 +675,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: @@ -703,7 +708,8 @@ static void ceph_destroy_client(struct ceph_client *client) dout("destroy_client %p\n", client); /* unmount */ - ceph_mdsc_stop(&client->mdsc); + if (client->have_mdsc) + ceph_mdsc_stop(&client->mdsc); ceph_osdc_stop(&client->osdc); /* @@ -996,7 +1002,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 2482d69..bdf089f 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -145,6 +145,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.7.0 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
