client: remove getgroups_cb

Nothing uses this callback.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 93079a6fd635ed1e185b131febe11802d8b94f5f)

Conflicts:
	src/client/fuse_ll.cc

diff --git a/src/client/Client.cc b/src/client/Client.cc
index a8c146e23a7f93015d07ee4eeefd940d833dfdde..733a243ad0e463805ac201e51a53305b817554f6 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -236,7 +236,6 @@ Client::Client(Messenger *m, MonClient *mc, Objecter *objecter_)
     remount_cb(NULL),
     ino_invalidate_cb(NULL),
     dentry_invalidate_cb(NULL),
-    getgroups_cb(NULL),
     umask_cb(NULL),
     can_invalidate_dentries(false),
     async_ino_invalidator(m->cct),
@@ -10001,7 +10000,6 @@ void Client::ll_register_callbacks(struct client_callback_args *args)
   ldout(cct, 10) << "ll_register_callbacks cb " << args->handle
                 << " invalidate_ino_cb " << args->ino_cb
                 << " invalidate_dentry_cb " << args->dentry_cb
-                << " getgroups_cb" << args->getgroups_cb
                 << " switch_interrupt_cb " << args->switch_intr_cb
                 << " remount_cb " << args->remount_cb
                 << dendl;
@@ -10022,7 +10020,6 @@ void Client::ll_register_callbacks(struct client_callback_args *args)
     remount_cb = args->remount_cb;
     remount_finisher.start();
   }
-  getgroups_cb = args->getgroups_cb;
   umask_cb = args->umask_cb;
 }
 

diff --git a/src/client/Client.h b/src/client/Client.h
index b4d397a3831283f571deeddc44134cbce1a32442..bd13391cb827eb040f452ca2495d4710d1a0082e 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -135,7 +135,6 @@ typedef void (*client_dentry_callback_t)(void *handle, vinodeno_t dirino,
                                         vinodeno_t ino, string& name);
 typedef int (*client_remount_callback_t)(void *handle);
 
-typedef int (*client_getgroups_callback_t)(void *handle, gid_t **sgids);
 typedef void(*client_switch_interrupt_callback_t)(void *handle, void *data);
 typedef mode_t (*client_umask_callback_t)(void *handle);
 
@@ -148,7 +147,6 @@ struct client_callback_args {
   client_dentry_callback_t dentry_cb;
   client_switch_interrupt_callback_t switch_intr_cb;
   client_remount_callback_t remount_cb;
-  client_getgroups_callback_t getgroups_cb;
   client_umask_callback_t umask_cb;
 };
 
@@ -276,7 +274,6 @@ class Client : public Dispatcher, public md_config_obs_t {
   client_remount_callback_t remount_cb;
   client_ino_callback_t ino_invalidate_cb;
   client_dentry_callback_t dentry_invalidate_cb;
-  client_getgroups_callback_t getgroups_cb;
   client_umask_callback_t umask_cb;
   bool can_invalidate_dentries;
 

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index ee2098ff42957ce6bbbe6bcd5593d1f2a64e07ea..718c074ac84249e481df3ec77cd1ba2ffc1d8c93 100644 (file)
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -127,13 +127,6 @@ static int getgroups(fuse_req_t req, gid_t **sgids)
   return -ENOSYS;
 }
 
-static int getgroups_cb(void *handle, gid_t **sgids)
-{
-  CephFuse::Handle *cfuse = (CephFuse::Handle *) handle;
-  fuse_req_t req = cfuse->get_fuse_req();
-  return getgroups(req, sgids);
-}
-
 static void get_fuse_groups(UserPerm& perms, fuse_req_t req)
 {
   if (g_conf->get_val<bool>("fuse_set_user_groups")) {
@@ -1137,7 +1130,6 @@ int CephFuse::Handle::start()
 #if defined(__linux__)
     remount_cb: remount_cb,
 #endif
-    getgroups_cb: getgroups_cb,
 #if !defined(DARWIN)
     umask_cb: umask_cb,
 #endif