From b3c1f81ddceeaeec8d6c30d5b3a658bad723bf08 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 19 Jun 2019 17:21:49 -0700 Subject: [PATCH] rgw: more metadata related initialization fixes Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_user.cc | 6 +++--- src/rgw/services/svc_meta_be_sobj.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 0b8600ea043..4b25a65555d 100644 --- 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 *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(obj); } diff --git a/src/rgw/services/svc_meta_be_sobj.h b/src/rgw/services/svc_meta_be_sobj.h index 95628722dfb..34398a750e1 100644 --- 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; } -- 2.39.5