From e323d41e766a6196af5d662b746fe35ce96252d8 Mon Sep 17 00:00:00 2001 From: zhang Shaowen Date: Fri, 31 May 2019 19:53:37 +0800 Subject: [PATCH] rgw: remove namespace from header file. Signed-off-by: zhang Shaowen --- src/rgw/rgw_object_lock.h | 1 - src/rgw/rgw_op.cc | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_object_lock.h b/src/rgw/rgw_object_lock.h index 5f5149d8e153c..4724907d1b056 100644 --- a/src/rgw/rgw_object_lock.h +++ b/src/rgw/rgw_object_lock.h @@ -5,7 +5,6 @@ #include "common/ceph_time.h" #include "common/iso_8601.h" #include "rgw_xml.h" -using namespace std; class DefaultRetention { diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index ca8dee2662adf..063534b98ff8a 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -4665,8 +4665,12 @@ void RGWDeleteObj::execute() /* check if obj exists, read orig attrs */ op_ret = get_obj_attrs(store, s, obj, attrs); if (op_ret < 0) { - /* object maybe delete_marker, skip check_obj_lock*/ - check_obj_lock = false; + if (op_ret == -ENOENT) { + /* object maybe delete_marker, skip check_obj_lock*/ + check_obj_lock = false; + } else { + return; + } } } -- 2.39.5