From 52c753129ad73ce8cf37094db1d05fc9eb878c5b Mon Sep 17 00:00:00 2001 From: Bingyin Zhang Date: Wed, 27 Dec 2017 16:00:16 +0800 Subject: [PATCH] rgw: remove useless lines in RGWDeleteBucket::execute Signed-off-by: Bingyin Zhang --- src/rgw/rgw_op.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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() -- 2.47.3