rgw: more metadata related initialization fixes

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

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 0b8600ea0439d65a68fbaa678dde2021a52f7a62..4b25a65555d22c5e42094a7526285be69f9e3ac4 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -160,7 +160,7 @@ int rgw_store_user_info(RGWUserCtl *user_ctl,
                         map<string, bufferlist> *pattrs)
 {
   return user_ctl->store_info(info, RGWUserCtl::PutParams()
-                                    .set_old_info(&info)
+                                    .set_old_info(old_info)
                                     .set_objv_tracker(objv_tracker)
                                     .set_mtime(mtime)
                                     .set_exclusive(exclusive)
@@ -2480,8 +2480,8 @@ public:
                              RGWSI_MetaBackend_Handler::Op *op, string& entry,
                              RGWMetadataObject *obj, RGWObjVersionTracker& objv_tracker,
                              optional_yield y,
-                             RGWMDLogSyncType type) : RGWMetadataHandlerPut_SObj(handler, op, entry, obj, objv_tracker, y, type),
-                                                      handler(_handler) {
+                             RGWMDLogSyncType type) : RGWMetadataHandlerPut_SObj(_handler, op, entry, obj, objv_tracker, type),
+                                                                handler(_handler) {
     uobj = static_cast<RGWUserMetadataObject *>(obj);
   }
 

diff --git a/src/rgw/services/svc_meta_be_sobj.h b/src/rgw/services/svc_meta_be_sobj.h
index 95628722dfb1f1ca54357314c8928ab8adb79d96..34398a750e15d23fdf4124e9bc364abddbd9f154 100644 (file)
--- a/src/rgw/services/svc_meta_be_sobj.h
+++ b/src/rgw/services/svc_meta_be_sobj.h
@@ -119,7 +119,7 @@ public:
 
   void init(RGWSI_SysObj *_sysobj_svc,
             RGWSI_MDLog *_mdlog_svc) {
-    base_init(mdlog_svc);
+    base_init(_mdlog_svc);
     sysobj_svc = _sysobj_svc;
   }