From 08b077338cba1250c36232f91c708d189326bbb6 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 16 Aug 2017 10:48:21 -0700 Subject: [PATCH] ceph-fuse: load supplementary groups by default Partially addresses POSIX test failures in [1] due to the config setting being false by default. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1480182#c6 Signed-off-by: Patrick Donnelly --- src/client/fuse_ll.cc | 2 +- src/common/legacy_config_opts.h | 1 - src/common/options.cc | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc index 1fdd3289a93..cbb0bb0762e 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -134,7 +134,7 @@ static int getgroups_cb(void *handle, gid_t **sgids) } #define GET_GROUPS(perms, req) { \ - if (cfuse->client->cct->_conf->fuse_set_user_groups) { \ + if (g_conf->get_val("fuse_set_user_groups")) { \ gid_t *gids = NULL; \ int count = getgroups(req, &gids); \ perms.init_gids(gids, count); \ diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 7222ef6ca7e..f680d68a92f 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -406,7 +406,6 @@ OPTION(fuse_debug, OPT_BOOL) OPTION(fuse_multithreaded, OPT_BOOL) OPTION(fuse_require_active_mds, OPT_BOOL) // if ceph_fuse requires active mds server OPTION(fuse_syncfs_on_mksnap, OPT_BOOL) -OPTION(fuse_set_user_groups, OPT_BOOL) // if ceph_fuse fills in group lists or not 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_die_on_failed_remount, OPT_BOOL) diff --git a/src/common/options.cc b/src/common/options.cc index e44d6b974e6..95ca71916fd 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -5918,8 +5918,8 @@ std::vector