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 5f5149d8e153c4a3829fce75cf267abd94c8321f..4724907d1b056781bf0c89bcea3b374a6018b4e5 100644 (file)
--- 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 edc562a727d777a30ccdb2b4f6cff3a96a1fae2a..5f295d848fe88b22bcb19db241ef234da200a704 100644 (file)
--- 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;
+        }
       }
     }