]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove useless lines in RGWDeleteBucket::execute 19699/head
authorBingyin Zhang <zhangbingyin@cloudin.cn>
Wed, 27 Dec 2017 08:00:16 +0000 (16:00 +0800)
committerBingyin Zhang <zhangbingyin@cloudin.cn>
Sat, 30 Dec 2017 22:44:04 +0000 (06:44 +0800)
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
src/rgw/rgw_op.cc

index fa5d363f40b911514c83d5ec3e30543457a5bb7d..8b3e17f1385edf1c9a416ec1cbc27fc6820c126f 100644 (file)
@@ -2841,10 +2841,10 @@ void RGWDeleteBucket::pre_exec()
 
 void RGWDeleteBucket::execute()
 {
-  op_ret = -EINVAL;
-
-  if (s->bucket_name.empty())
+  if (s->bucket_name.empty()) {
+    op_ret = -EINVAL;
     return;
+  }
 
   if (!s->bucket_exists) {
     ldout(s->cct, 0) << "ERROR: bucket " << s->bucket_name << " not found" << dendl;
@@ -2933,12 +2933,6 @@ void RGWDeleteBucket::execute()
                       << dendl;
     }
   }
-
-  if (op_ret < 0) {
-    return;
-  }
-
-
 }
 
 int RGWPutObj::verify_permission()