From 4b50e12b8e5757eac0ddb454829db7cb100989ff Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Wed, 8 Aug 2018 13:32:43 -0400
Subject: [PATCH] common: add doc strings to client_mds_namespace

...and remove it from legacy options, as it's
now accessed by get_val.

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/common/legacy_config_opts.h | 1 -
 src/common/options.cc           | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 2b3fb0d62c4..c3025d5516a 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -386,7 +386,6 @@ OPTION(client_dirsize_rbytes, OPT_BOOL)
 OPTION(client_try_dentry_invalidate, OPT_BOOL) // the client should try to use dentry invaldation instead of remounting, on kernels it believes that will work for
 OPTION(client_check_pool_perm, OPT_BOOL)
 OPTION(client_use_faked_inos, OPT_BOOL)
-OPTION(client_mds_namespace, OPT_STR)
 
 OPTION(crush_location, OPT_STR)       // whitespace-separated list of key=value pairs describing crush location
 OPTION(crush_location_hook, OPT_STR)
diff --git a/src/common/options.cc b/src/common/options.cc
index d1c295d3fb3..67daae17a7c 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7442,7 +7442,12 @@ std::vector<Option> get_mds_client_options() {
 
     Option("client_mds_namespace", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description("CephFS file system name to mount"),
+    .set_description("CephFS file system name to mount")
+    .set_long_description("Use this with ceph-fuse, or with any process "
+        "that uses libcephfs.  Programs using libcephfs may also pass "
+        "the filesystem name into mount(), which will override this setting. "
+        "If no filesystem name is given in mount() or this setting, the default "
+        "filesystem will be mounted (usually the first created)."),
   });
 }
 
-- 
2.39.5