rgw: remove unused sysobj ctx args

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/services/svc_sys_obj.cc b/src/rgw/services/svc_sys_obj.cc
index 5330f435d234f53469b7e4b2a3eb48ab8404c261..a19a66279f1f02a34cd732705b26437a5eabb36c 100644 (file)
--- a/src/rgw/services/svc_sys_obj.cc
+++ b/src/rgw/services/svc_sys_obj.cc
@@ -36,10 +36,8 @@ int RGWSI_SysObj::Obj::ROp::stat(optional_yield y, const DoutPrefixProvider *dpp
   RGWSI_SysObj_Core *svc = source.core_svc;
   rgw_raw_obj& obj = source.obj;
 
-  return svc->stat(source.get_ctx(), *state, obj,
-                  attrs, raw_attrs,
-                   lastmod, obj_size,
-                   objv_tracker, y, dpp);
+  return svc->stat(*state, obj, attrs, raw_attrs,
+                   lastmod, obj_size, objv_tracker, y, dpp);
 }
 
 int RGWSI_SysObj::Obj::ROp::read(const DoutPrefixProvider *dpp,
@@ -49,7 +47,7 @@ int RGWSI_SysObj::Obj::ROp::read(const DoutPrefixProvider *dpp,
   RGWSI_SysObj_Core *svc = source.core_svc;
   rgw_raw_obj& obj = source.get_obj();
 
-  return svc->read(dpp, source.get_ctx(), *state,
+  return svc->read(dpp, *state,
                    objv_tracker,
                    obj, bl, ofs, end,
                    attrs,
@@ -73,9 +71,7 @@ int RGWSI_SysObj::Obj::WOp::remove(const DoutPrefixProvider *dpp, optional_yield
   RGWSI_SysObj_Core *svc = source.core_svc;
   rgw_raw_obj& obj = source.get_obj();
 
-  return svc->remove(dpp, source.get_ctx(),
-                     objv_tracker,
-                     obj, y);
+  return svc->remove(dpp, objv_tracker, obj, y);
 }
 
 int RGWSI_SysObj::Obj::WOp::write(const DoutPrefixProvider *dpp, bufferlist& bl, optional_yield y)

diff --git a/src/rgw/services/svc_sys_obj_cache.cc b/src/rgw/services/svc_sys_obj_cache.cc
index 238db954dfe51cb86354297ff353ac06d5dc5ce0..e329c37e36d0d803c46be3e07009df289e1718a3 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.cc
+++ b/src/rgw/services/svc_sys_obj_cache.cc
@@ -85,7 +85,6 @@ void RGWSI_SysObj_Cache::normalize_pool_and_obj(const rgw_pool& src_pool, const
 
 
 int RGWSI_SysObj_Cache::remove(const DoutPrefixProvider *dpp, 
-                               RGWSysObjectCtxBase& obj_ctx,
                                RGWObjVersionTracker *objv_tracker,
                                const rgw_raw_obj& obj,
                                optional_yield y)
@@ -104,11 +103,10 @@ int RGWSI_SysObj_Cache::remove(const DoutPrefixProvider *dpp,
     ldpp_dout(dpp, 0) << "ERROR: " << __func__ << "(): failed to distribute cache: r=" << r << dendl;
   }
 
-  return RGWSI_SysObj_Core::remove(dpp, obj_ctx, objv_tracker, obj, y);
+  return RGWSI_SysObj_Core::remove(dpp, objv_tracker, obj, y);
 }
 
 int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp,
-                             RGWSysObjectCtxBase& obj_ctx,
                              RGWSI_SysObj_Obj_GetObjState& read_state,
                              RGWObjVersionTracker *objv_tracker,
                              const rgw_raw_obj& obj,
@@ -122,7 +120,7 @@ int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp,
   rgw_pool pool;
   string oid;
   if (ofs != 0) {
-    return RGWSI_SysObj_Core::read(dpp, obj_ctx, read_state, objv_tracker,
+    return RGWSI_SysObj_Core::read(dpp, read_state, objv_tracker,
                                    obj, obl, ofs, end, attrs, raw_attrs,
                                    cache_info, refresh_version, y);
   }
@@ -166,7 +164,7 @@ int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp,
     return -ENOENT;
 
   map<string, bufferlist> unfiltered_attrset;
-  r = RGWSI_SysObj_Core::read(dpp, obj_ctx, read_state, objv_tracker,
+  r = RGWSI_SysObj_Core::read(dpp, read_state, objv_tracker,
                          obj, obl, ofs, end,
                         (attrs ? &unfiltered_attrset : nullptr),
                         true, /* cache unfiltered attrs */

diff --git a/src/rgw/services/svc_sys_obj_cache.h b/src/rgw/services/svc_sys_obj_cache.h
index a3628d84cdd293d05f34139c6f08a44cafb71a21..79119a721de2196579703c08e72e8d4ea8b90106 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.h
+++ b/src/rgw/services/svc_sys_obj_cache.h
@@ -44,7 +44,6 @@ protected:
                optional_yield y) override;
 
   int read(const DoutPrefixProvider *dpp,
-           RGWSysObjectCtxBase& obj_ctx,
            RGWSI_SysObj_Obj_GetObjState& read_state,
            RGWObjVersionTracker *objv_tracker,
            const rgw_raw_obj& obj,
@@ -66,7 +65,6 @@ protected:
                 bool exclusive, optional_yield y) override;
 
   int remove(const DoutPrefixProvider *dpp, 
-             RGWSysObjectCtxBase& obj_ctx,
              RGWObjVersionTracker *objv_tracker,
              const rgw_raw_obj& obj,
              optional_yield y) override;

diff --git a/src/rgw/services/svc_sys_obj_core.cc b/src/rgw/services/svc_sys_obj_core.cc
index 32d11e9153c7384875f698567df87d3d5b475198..3b1ea66ffc0017cca5e3094eee091d1439b21199 100644 (file)
--- a/src/rgw/services/svc_sys_obj_core.cc
+++ b/src/rgw/services/svc_sys_obj_core.cc
@@ -89,8 +89,7 @@ int RGWSI_SysObj_Core::raw_stat(const DoutPrefixProvider *dpp, const rgw_raw_obj
   return 0;
 }
 
-int RGWSI_SysObj_Core::stat(RGWSysObjectCtxBase& obj_ctx,
-                            RGWSI_SysObj_Obj_GetObjState& _state,
+int RGWSI_SysObj_Core::stat(RGWSI_SysObj_Obj_GetObjState& _state,
                             const rgw_raw_obj& obj,
                             map<string, bufferlist> *attrs,
                            bool raw_attrs,
@@ -131,7 +130,6 @@ int RGWSI_SysObj_Core::stat(RGWSysObjectCtxBase& obj_ctx,
 }
 
 int RGWSI_SysObj_Core::read(const DoutPrefixProvider *dpp,
-                            RGWSysObjectCtxBase& obj_ctx,
                             RGWSI_SysObj_Obj_GetObjState& _read_state,
                             RGWObjVersionTracker *objv_tracker,
                             const rgw_raw_obj& obj,
@@ -446,7 +444,6 @@ int RGWSI_SysObj_Core::notify(const DoutPrefixProvider *dpp, const rgw_raw_obj&
 }
 
 int RGWSI_SysObj_Core::remove(const DoutPrefixProvider *dpp, 
-                              RGWSysObjectCtxBase& obj_ctx,
                               RGWObjVersionTracker *objv_tracker,
                               const rgw_raw_obj& obj,
                               optional_yield y)

diff --git a/src/rgw/services/svc_sys_obj_core.h b/src/rgw/services/svc_sys_obj_core.h
index 6536d29c48e55955d49ade7416eb1490b5f979b8..46de412f6247d2cb93b16718be2a4128b5dfb513 100644 (file)
--- a/src/rgw/services/svc_sys_obj_core.h
+++ b/src/rgw/services/svc_sys_obj_core.h
@@ -40,7 +40,6 @@ protected:
                        optional_yield y);
 
   virtual int read(const DoutPrefixProvider *dpp,
-                   RGWSysObjectCtxBase& obj_ctx,
                    RGWSI_SysObj_Obj_GetObjState& read_state,
                    RGWObjVersionTracker *objv_tracker,
                    const rgw_raw_obj& obj,
@@ -52,7 +51,6 @@ protected:
                    optional_yield y);
 
   virtual int remove(const DoutPrefixProvider *dpp, 
-                     RGWSysObjectCtxBase& obj_ctx,
                      RGWObjVersionTracker *objv_tracker,
                      const rgw_raw_obj& obj,
                      optional_yield y);
@@ -127,8 +125,7 @@ protected:
   virtual int pool_list_objects_get_marker(RGWSI_SysObj::Pool::ListCtx& _ctx,
                                            std::string *marker);
 
-  int stat(RGWSysObjectCtxBase& obj_ctx,
-           RGWSI_SysObj_Obj_GetObjState& state,
+  int stat(RGWSI_SysObj_Obj_GetObjState& state,
            const rgw_raw_obj& obj,
            std::map<std::string, bufferlist> *attrs,
           bool raw_attrs,