From: Bingyin Zhang <zhangbingyin@cloudin.cn>
Date: Wed, 27 Dec 2017 08:00:16 +0000 (+0800)
Subject: rgw: remove useless lines in RGWDeleteBucket::execute
X-Git-Tag: v13.0.2~549^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19699%2Fhead;p=ceph.git

rgw: remove useless lines in RGWDeleteBucket::execute

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index fa5d363f40b9..8b3e17f1385e 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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()