client: consolidate client_mount_{uid,gid} and client_{user,group}_id options

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d351e5f5fed50a612ab061584ecb26c52a97c950..8d3fd279b48ad2c503b2d0ecf74d3d5a8eec3ab6 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -266,8 +266,8 @@ Client::Client(Messenger *m, MonClient *mc)
   _dir_vxattrs_name_size = _vxattrs_calcu_name_size(_dir_vxattrs);
   _file_vxattrs_name_size = _vxattrs_calcu_name_size(_file_vxattrs);
 
-  user_id = cct->_conf->client_user_id;
-  group_id = cct->_conf->client_group_id;
+  user_id = cct->_conf->client_mount_uid;
+  group_id = cct->_conf->client_mount_gid;
 
   lru.lru_set_max(cct->_conf->client_cache_size);
   lru.lru_set_midpoint(cct->_conf->client_cache_mid);
@@ -5053,7 +5053,7 @@ int Client::mount(const std::string &mount_root, bool require_mds)
     MetaRequest *req = new MetaRequest(CEPH_MDS_OP_GETATTR);
     req->set_filepath(fp);
     req->head.args.getattr.mask = CEPH_STAT_CAP_INODE_ALL;
-    int res = make_request(req, cct->_conf->client_mount_uid, cct->_conf->client_mount_gid);
+    int res = make_request(req, -1, -1);
     if (res < 0) {
       if (res == -EACCES && root) {
        ldout(cct, 1) << __func__ << " EACCES on parent of mount point; quotas may not work" << dendl;

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index b34ea3f1469ab8f77b7b6ada7dd4628bd05f0630..78d74ccaa3e302a6ac3b02d17d7b45c5147d0d2f 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -367,8 +367,6 @@ OPTION(fuse_debug, OPT_BOOL, false)
 OPTION(fuse_multithreaded, OPT_BOOL, true)
 OPTION(fuse_require_active_mds, OPT_BOOL, true) // if ceph_fuse requires active mds server
 
-OPTION(client_user_id, OPT_INT, -1)
-OPTION(client_group_id, OPT_INT, -1)
 OPTION(client_try_dentry_invalidate, OPT_BOOL, true) // the client should try to use dentry invaldation instead of remounting, on kernels it believes that will work for
 OPTION(client_die_on_failed_remount, OPT_BOOL, true)
 OPTION(client_check_pool_perm, OPT_BOOL, true)