rgw: no need to pass in RGWRados to rgw_get_system_obj()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 30968be3020c2a3d66bffb98b14238497d2b242c..06aae393f0353e5b2a58531322881208a70f09e1 100644 (file)
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -364,7 +364,7 @@ int read_history(RGWRados *store, RGWMetadataLogHistory *state,
   auto& pool = store->svc.zone->get_zone_params().log_pool;
   const auto& oid = RGWMetadataLogHistory::oid;
   bufferlist bl;
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, oid, bl, objv_tracker, nullptr, null_yield);
+  int ret = rgw_get_system_obj(obj_ctx, pool, oid, bl, objv_tracker, nullptr, null_yield);
   if (ret < 0) {
     return ret;
   }
@@ -804,7 +804,7 @@ int RGWMetadataManager::prepare_mutate(RGWRados *store,
   bufferlist bl;
   real_time orig_mtime;
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, oid,
+  int ret = rgw_get_system_obj(obj_ctx, pool, oid,
                                bl, objv_tracker, &orig_mtime,
                                null_yield, nullptr, nullptr);
   if (ret < 0 && ret != -ENOENT) {

diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/rgw_pubsub.h
index fe23a93695fd4a1bc3d2ba31f6ed9c5f36226238..943724c4edc1008fbee5a218799e5c5a4103d01e 100644 (file)
--- a/src/rgw/rgw_pubsub.h
+++ b/src/rgw/rgw_pubsub.h
@@ -591,7 +591,7 @@ template <class T>
 int RGWUserPubSub::read(const rgw_raw_obj& obj, T *result, RGWObjVersionTracker *objv_tracker)
 {
   bufferlist bl;
-  int ret = rgw_get_system_obj(store, obj_ctx,
+  int ret = rgw_get_system_obj(obj_ctx,
                                obj.pool, obj.oid,
                                bl,
                                objv_tracker,

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 01235e6dbaf4675432f30d54c26b5fbfddde7d98..4f4b05c76cf4015491fbf23e87bd7939e081f838 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -7816,7 +7816,7 @@ int RGWRados::get_bucket_instance_from_oid(RGWSysObjectCtx& obj_ctx, const strin
 
   bufferlist epbl;
 
-  int ret = rgw_get_system_obj(this, obj_ctx, domain_root,
+  int ret = rgw_get_system_obj(obj_ctx, domain_root,
                               oid, epbl, &info.objv_tracker, pmtime, y, pattrs,
                               cache_info, refresh_version);
   if (ret < 0) {
@@ -7849,7 +7849,7 @@ int RGWRados::get_bucket_entrypoint_info(RGWSysObjectCtx& obj_ctx,
   string bucket_entry;
 
   rgw_make_bucket_entry_name(tenant_name, bucket_name, bucket_entry);
-  int ret = rgw_get_system_obj(this, obj_ctx, svc.zone->get_zone_params().domain_root,
+  int ret = rgw_get_system_obj(obj_ctx, svc.zone->get_zone_params().domain_root,
                               bucket_entry, bl, objv_tracker, pmtime, null_yield, pattrs,
                               cache_info, refresh_version);
   if (ret < 0) {

diff --git a/src/rgw/rgw_role.cc b/src/rgw/rgw_role.cc
index 63422a1562cc818cb16e17a4c146c751c0649055..4c85830910bd45eadd071b001afb6865001ac800 100644 (file)
--- a/src/rgw/rgw_role.cc
+++ b/src/rgw/rgw_role.cc
@@ -305,7 +305,7 @@ int RGWRole::read_id(const string& role_name, const string& tenant, string& role
   bufferlist bl;
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
 
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
+  int ret = rgw_get_system_obj(obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
   if (ret < 0) {
     return ret;
   }
@@ -331,7 +331,7 @@ int RGWRole::read_info()
   bufferlist bl;
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
 
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
+  int ret = rgw_get_system_obj(obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
   if (ret < 0) {
     ldout(cct, 0) << "ERROR: failed reading role info from pool: " << pool.name <<
                   ": " << id << ": " << cpp_strerror(-ret) << dendl;
@@ -358,7 +358,7 @@ int RGWRole::read_name()
   bufferlist bl;
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
 
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
+  int ret = rgw_get_system_obj(obj_ctx, pool, oid, bl, NULL, NULL, null_yield);
   if (ret < 0) {
     ldout(cct, 0) << "ERROR: failed reading role name from pool: " << pool.name << ": "
                   << name << ": " << cpp_strerror(-ret) << dendl;

diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
index 6d1a2bb085d443bb5bbf932b180b7b5278ce4589..9a6c5eb196de59d25bd54d9fea8e4653b7e3a0ae 100644 (file)
--- a/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@ -130,9 +130,8 @@ int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& o
   return ret;
 }
 
-int rgw_get_system_obj(RGWRados *rgwstore, RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl,
+int rgw_get_system_obj(RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl,
                        RGWObjVersionTracker *objv_tracker, real_time *pmtime, optional_yield y, map<string, bufferlist> *pattrs,
-                       rgw_cache_entry_info *cache_info, boost::optional<obj_version> refresh_version)
 {
   bufferlist::iterator iter;
   int request_len = READ_CHUNK_LEN;

diff --git a/src/rgw/rgw_tools.h b/src/rgw/rgw_tools.h
index e3c2471c875bba5dcefe9af7b166f15d57e69a93..d3a27f9d1ca79e115cccac8eedc9fc4ed9cf6d79 100644 (file)
--- a/src/rgw/rgw_tools.h
+++ b/src/rgw/rgw_tools.h
@@ -24,7 +24,7 @@ int rgw_init_ioctx(librados::Rados *rados, const rgw_pool& pool,
 
 int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& oid, bufferlist& data, bool exclusive,
                        RGWObjVersionTracker *objv_tracker, real_time set_mtime, map<string, bufferlist> *pattrs = NULL);
-int rgw_get_system_obj(RGWRados *rgwstore, RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl,
+int rgw_get_system_obj(RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl,
                        RGWObjVersionTracker *objv_tracker, real_time *pmtime, optional_yield y, map<string, bufferlist> *pattrs = NULL,
                        rgw_cache_entry_info *cache_info = NULL,
                       boost::optional<obj_version> refresh_version = boost::none);

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index e93ff9ca7ca4f7fd73a1778a14af77edf73fa894..9c723e33c82d6fa78a1203a8dd8b9777f137caa1 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -280,7 +280,7 @@ int rgw_get_user_info_from_index(RGWRados * const store,
   RGWUID uid;
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
 
-  int ret = rgw_get_system_obj(store, obj_ctx, pool, key, bl, NULL, &e.mtime, null_yield);
+  int ret = rgw_get_system_obj(obj_ctx, pool, key, bl, NULL, &e.mtime, null_yield);
   if (ret < 0)
     return ret;
 
@@ -326,7 +326,7 @@ int rgw_get_user_info_by_uid(RGWRados *store,
 
   auto obj_ctx = store->svc.sysobj->init_obj_ctx();
   string oid = uid.to_str();
-  int ret = rgw_get_system_obj(store, obj_ctx, store->svc.zone->get_zone_params().user_uid_pool, oid, bl, objv_tracker, pmtime, null_yield, pattrs, cache_info);
+  int ret = rgw_get_system_obj(obj_ctx, store->svc.zone->get_zone_params().user_uid_pool, oid, bl, objv_tracker, pmtime, null_yield, pattrs, cache_info);
   if (ret < 0) {
     return ret;
   }