rgw: Migrate to using non-deprecated class call functions.

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/src/rgw/driver/rados/buckets.cc b/src/rgw/driver/rados/buckets.cc
index c22f9b30e7a99ed7b509f73ccd59ee4fa7a7d2e9..ad1ae5a9561c29cf03b00365bdeee130b51e09dc 100644 (file)
--- a/src/rgw/driver/rados/buckets.cc
+++ b/src/rgw/driver/rados/buckets.cc
@@ -242,7 +242,7 @@ int reset_stats(const DoutPrefixProvider* dpp, optional_yield y,
     ret.update_call(call);
 
     encode(call, in);
-    op.exec("user", "reset_user_stats2", in, &out, &rval);
+    op.exec(cls::user::method::reset_user_stats2, in, &out, &rval);
     r = ref.operate(dpp, std::move(op), y, librados::OPERATION_RETURNVEC);
     if (r < 0) {
       return r;

diff --git a/src/rgw/driver/rados/rgw_cr_rados.cc b/src/rgw/driver/rados/rgw_cr_rados.cc
index 32f36f58db2c4992b513e26aff86c9e1f827038e..05b52318e452007bddf325822d138e53028d620f 100644 (file)
--- a/src/rgw/driver/rados/rgw_cr_rados.cc
+++ b/src/rgw/driver/rados/rgw_cr_rados.cc
@@ -718,7 +718,7 @@ int RGWRadosBILogTrimCR::send_request(const DoutPrefixProvider *dpp)
 
   librados::ObjectWriteOperation op;
   op.assert_exists();
-  op.exec(RGW_CLASS, RGW_BI_LOG_TRIM, in);
+  op.exec(cls::rgw::method::bi_log_trim, in);
 
   cn = stack->create_completion_notifier();
   return bs.bucket_obj.aio_operate(cn->completion(), &op);

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index 2a1b5d541ea9df288a06e70c64bb0bc370735be3..56004044654e4fe9c333790b1d6a3f9192bcb25d 100644 (file)
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -6394,12 +6394,12 @@ void RGWRados::remove_rgw_head_obj(ObjectWriteOperation& op)
   cls_rgw_remove_obj(op, prefixes);
 }
 
-void RGWRados::cls_obj_check_prefix_exist(ObjectOperation& op, const string& prefix, bool fail_if_exist)
+void RGWRados::cls_obj_check_prefix_exist(ObjectWriteOperation& op, const string& prefix, bool fail_if_exist)
 {
   cls_rgw_obj_check_attrs_prefix(op, prefix, fail_if_exist);
 }
 
-void RGWRados::cls_obj_check_mtime(ObjectOperation& op, const real_time& mtime, bool high_precision_time, RGWCheckMTimeType type)
+void RGWRados::cls_obj_check_mtime(ObjectWriteOperation& op, const real_time& mtime, bool high_precision_time, RGWCheckMTimeType type)
 {
   cls_rgw_obj_check_mtime(op, mtime, high_precision_time, type);
 }

diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h
index 38e2f3dcb7da18cbbcb40692a22a799871644822..b518c92e1948db724e6f860e2409890cc20e2e7f 100644 (file)
--- a/src/rgw/driver/rados/rgw_rados.h
+++ b/src/rgw/driver/rados/rgw_rados.h
@@ -414,8 +414,8 @@ class RGWRados
   int update_placement_map();
 
   void remove_rgw_head_obj(librados::ObjectWriteOperation& op);
-  void cls_obj_check_prefix_exist(librados::ObjectOperation& op, const std::string& prefix, bool fail_if_exist);
-  void cls_obj_check_mtime(librados::ObjectOperation& op, const real_time& mtime, bool high_precision_time, RGWCheckMTimeType type);
+  void cls_obj_check_prefix_exist(librados::ObjectWriteOperation& op, const std::string& prefix, bool fail_if_exist);
+  void cls_obj_check_mtime(librados::ObjectWriteOperation& op, const real_time& mtime, bool high_precision_time, RGWCheckMTimeType type);
 protected:
   CephContext* cct{nullptr};