Merge PR #33506 into master

* refs/pull/33506/head:
	client: add client_fs mount option support

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc qa/tasks/cephfs/fuse_mount.py
index 27d89437df7a23cf2b3ea2e2b77245bbe8de0755,29fa4319d65e87554cfa1b1f58aa75b325c4e36a..0faf3a90215025225781952b6ab1e4086fda790c
--- 1/qa/tasks/cephfs/fuse_mount.py
--- 2/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@@ -68,10 -68,8 +68,10 @@@ class FuseMount(CephFSMount)
              fuse_cmd += ["--client_mountpoint={0}".format(mount_path)]
  
          if mount_fs_name is not None:
-             fuse_cmd += ["--client_mds_namespace={0}".format(mount_fs_name)]
+             fuse_cmd += ["--client_fs={0}".format(mount_fs_name)]
  
 +        fuse_cmd += mount_options
 +
          fuse_cmd += [
              '--name', 'client.{id}'.format(id=self.client_id),
              # TODO ceph-fuse doesn't understand dash dash '--',

diff --cc qa/tasks/vstart_runner.py
index 05f795babc6da581d63692104355512100050b34,660882a06e95876516546077db604468b53f7759..02f2da7cf96ee27bcd4e503837b8196ab0164d64
--- 1/qa/tasks/vstart_runner.py
--- 2/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@@ -854,10 -844,8 +854,10 @@@ class LocalFuseMount(FuseMount)
              prefix += ["--client_mountpoint={0}".format(mount_path)]
  
          if mount_fs_name is not None:
-             prefix += ["--client_mds_namespace={0}".format(mount_fs_name)]
+             prefix += ["--client_fs={0}".format(mount_fs_name)]
  
 +        prefix += mount_options;
 +
          self.fuse_daemon = self.client_remote.run(args=
                                              prefix + [
                                                  "-f",

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/include/cephfs/libcephfs.h
Simple merge