rgw: acl: drop unused function & make get_group_perm const

Drop the unused RGWAccessControlPolicy::get_group_perm, make the ACL
get_group_perm as a const member function

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc
index 7f112cd97433b906511c3bd94047215038acc3bd..8a58cca0aaf6bf432f561eadb8f022593a9287a4 100644 (file)
--- a/src/rgw/rgw_acl.cc
+++ b/src/rgw/rgw_acl.cc
@@ -77,7 +77,7 @@ uint32_t RGWAccessControlList::get_perm(const DoutPrefixProvider* dpp,
 }
 
 uint32_t RGWAccessControlList::get_group_perm(ACLGroupTypeEnum group,
-                                              const uint32_t perm_mask)
+                                              const uint32_t perm_mask) const
 {
   ldout(cct, 5) << "Searching permissions for group=" << (int)group
                 << " mask=" << perm_mask << dendl;

diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h
index c08edda078ca8a346aaaa8d0411b29caea737e18..2b9ff3694dc3a9db4a2df322c10cbae56a832cc1 100644 (file)
--- a/src/rgw/rgw_acl.h
+++ b/src/rgw/rgw_acl.h
@@ -306,7 +306,7 @@ public:
   uint32_t get_perm(const DoutPrefixProvider* dpp,
                     const rgw::auth::Identity& auth_identity,
                     uint32_t perm_mask);
-  uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask);
+  uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask) const;
   uint32_t get_referer_perm(uint32_t current_perm,
                             std::string http_referer,
                             uint32_t perm_mask);
@@ -419,7 +419,6 @@ public:
                     const rgw::auth::Identity& auth_identity,
                     uint32_t perm_mask,
                     const char * http_referer);
-  uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask);
   bool verify_permission(const DoutPrefixProvider* dpp,
                          const rgw::auth::Identity& auth_identity,
                          uint32_t user_perm_mask,