From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 31 May 2019 11:53:37 +0000 (+0800)
Subject: rgw: remove namespace from header file.
X-Git-Tag: v14.2.5~119^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7bfa6f560fd27dd2c27242fb3c9cc5b26f3167e;p=ceph.git

rgw: remove namespace from header file.

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit e323d41e766a6196af5d662b746fe35ce96252d8)
---

diff --git a/src/rgw/rgw_object_lock.h b/src/rgw/rgw_object_lock.h
index 5f5149d8e15..4724907d1b0 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 edc562a727d..5f295d848fe 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4604,8 +4604,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;
+        }
       }
     }