From: Mark Houghton <mhoughton@microfocus.com>
Date: Tue, 3 Nov 2020 15:14:06 +0000 (+0000)
Subject: rgw: rename variable for clarity
X-Git-Tag: v16.1.0~425^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d22b7d29a25db4f648daf0c51be74702d4149a2;p=ceph.git

rgw: rename variable for clarity

Signed-off-by: Mark Houghton <mhoughton@microfocus.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 85bb3fbf8d40..ed9cc20440ee 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6404,11 +6404,11 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
       }
     }
 
-    bool empty = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_instance().empty();
+    bool not_versioned = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_instance().empty();
 
     auto usr_policy_res = eval_user_policies(s->iam_user_policies, s->env,
                                               boost::none,
-                                              empty ?
+                                              not_versioned ?
                                               rgw::IAM::s3DeleteObject :
                                               rgw::IAM::s3DeleteObjectVersion,
                                               ARN(s->bucket->get_key()));
@@ -6419,7 +6419,7 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
     rgw::IAM::Effect r = Effect::Pass;
     if (s->iam_policy) {
       r = s->iam_policy->eval(s->env, *s->auth.identity,
-				 empty ?
+				 not_versioned ?
 				 rgw::IAM::s3DeleteObject :
 				 rgw::IAM::s3DeleteObjectVersion,
 				 ARN(s->bucket->get_key()));