From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 21 Sep 2018 07:12:43 +0000 (-0700)
Subject: rgw: api fixes following rebase
X-Git-Tag: v14.1.0~965^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc4ecac03144b874ebd972a35e2f448ff7ad7990;p=ceph.git

rgw: api fixes following rebase

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

diff --git a/src/rgw/rgw_cr_rados.cc b/src/rgw/rgw_cr_rados.cc
index e9355b83c053..176ff41d36bd 100644
--- a/src/rgw/rgw_cr_rados.cc
+++ b/src/rgw/rgw_cr_rados.cc
@@ -142,7 +142,7 @@ RGWAsyncPutSystemObj::RGWAsyncPutSystemObj(RGWCoroutine *caller, RGWAioCompletio
                      RGWSI_SysObj *_svc,
                      RGWObjVersionTracker *_objv_tracker, const rgw_raw_obj& _obj,
                      bool _exclusive, bufferlist _bl)
-  : RGWAsyncRadosRequest(caller, cn), store(_store),
+  : RGWAsyncRadosRequest(caller, cn), svc(_svc),
     obj(_obj), exclusive(_exclusive), bl(std::move(_bl))
 {
   if (_objv_tracker) {
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 3d94fbb7fb08..40a1ebe7e23c 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -845,7 +845,7 @@ int RGWPutObj_ObjStore_SWIFT::update_slo_segment_size(rgw_slo_entry& entry) {
   if (bucket_name.compare(s->bucket.name) != 0) {
     RGWBucketInfo bucket_info;
     map<string, bufferlist> bucket_attrs;
-    RGWObjectCtx obj_ctx(store);
+    auto obj_ctx = store->svc.sysobj->init_obj_ctx();
     r = store->get_bucket_info(obj_ctx, s->user->user_id.tenant,
 			       bucket_name, bucket_info, nullptr,
 			       &bucket_attrs);
@@ -865,7 +865,7 @@ int RGWPutObj_ObjStore_SWIFT::update_slo_segment_size(rgw_slo_entry& entry) {
 
   /* no prefetch */
   RGWObjectCtx obj_ctx(store);
-  obj_ctx.obj.set_atomic(slo_seg);
+  obj_ctx.set_atomic(slo_seg);
 
   RGWRados::Object op_target(store, s->bucket_info, obj_ctx, slo_seg);
   RGWRados::Object::Read read_op(&op_target);