From 93079a6fd635ed1e185b131febe11802d8b94f5f Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Tue, 3 Apr 2018 10:27:15 -0400 Subject: [PATCH] client: remove getgroups_cb Nothing uses this callback. Signed-off-by: Jeff Layton --- src/client/Client.cc | 3 --- src/client/Client.h | 3 --- src/client/fuse_ll.cc | 8 -------- 3 files changed, 14 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 2b1a938961b71..77e19032db5b4 100644 --- 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), @@ -9961,7 +9960,6 @@ void Client::ll_register_callbacks(struct client_callback_args *args) ldout(cct, 10) << __func__ << " 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; @@ -9982,7 +9980,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 59479f13ccd5d..0f69bdfa503a3 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -131,7 +131,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); @@ -144,7 +143,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; }; @@ -272,7 +270,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 115c26bcdaad8..6694fc4c3ee5c 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -129,13 +129,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("fuse_set_user_groups")) { @@ -1176,7 +1169,6 @@ int CephFuse::Handle::start() #if defined(__linux__) remount_cb: remount_cb, #endif - getgroups_cb: getgroups_cb, #if !defined(__APPLE__) umask_cb: umask_cb, #endif -- 2.39.5