rgw: remove unused bucket parameter in check_bucket_shards

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>

diff --git a/src/rgw/rgw_quota.cc b/src/rgw/rgw_quota.cc
index 07f2f4cc4ec4732894913a582a8dd1f0bffbc419..5fb894ca0c544e8df61f7e9db82a62e961df722e 100644 (file)
--- a/src/rgw/rgw_quota.cc
+++ b/src/rgw/rgw_quota.cc
@@ -973,8 +973,7 @@ public:
   }
 
   void check_bucket_shards(uint64_t max_objs_per_shard, uint64_t num_shards,
-                          const rgw_bucket& bucket, uint64_t num_objs,
-                          bool& need_resharding, uint32_t *suggested_num_shards) override
+                          uint64_t num_objs, bool& need_resharding, uint32_t *suggested_num_shards) override
   {
     if (num_objs > num_shards * max_objs_per_shard) {
       ldout(store->ctx(), 0) << __func__ << ": resharding needed: stats.num_objects=" << num_objs

diff --git a/src/rgw/rgw_quota.h b/src/rgw/rgw_quota.h
index d64f6a10ca037a28c573ab500d7412c2cf551edd..ece795207cd431d62996276e68375fa8fe7ec1a3 100644 (file)
--- a/src/rgw/rgw_quota.h
+++ b/src/rgw/rgw_quota.h
@@ -108,8 +108,7 @@ public:
                          uint64_t num_objs, uint64_t size) = 0;
 
   virtual void check_bucket_shards(uint64_t max_objs_per_shard, uint64_t num_shards,
-                                  const rgw_bucket& bucket, uint64_t num_objs,
-                                  bool& need_resharding, uint32_t *suggested_num_shards) = 0;
+                                  uint64_t num_objs, bool& need_resharding, uint32_t *suggested_num_shards) = 0;
 
   virtual void update_stats(const rgw_user& bucket_owner, rgw_bucket& bucket, int obj_delta, uint64_t added_bytes, uint64_t removed_bytes) = 0;
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e3ef936d255ee43c6ded6813d29b29ff77d88fef..0e5df2105ee040f6c8fc534402091769233662a5 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -8521,8 +8521,7 @@ int RGWRados::check_bucket_shards(const RGWBucketInfo& bucket_info,
     cct->_conf.get_val<uint64_t>("rgw_max_objs_per_shard");
 
   quota_handler->check_bucket_shards(max_objs_per_shard, num_source_shards,
-                                    bucket, num_objs, need_resharding,
-                                    &suggested_num_shards);
+                                    num_objs, need_resharding, &suggested_num_shards);
   if (! need_resharding) {
     return 0;
   }