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: v15.2.14~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=feedea11cc7316ac6b459fa453595746d6e06d53;p=ceph.git

rgw: rename variable for clarity

Signed-off-by: Mark Houghton <mhoughton@microfocus.com>
(cherry picked from commit 5d22b7d29a25db4f648daf0c51be74702d4149a2)

Conflicts:
        src/rgw/rgw_op.cc (trivial)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 2996a461bf6..7ec5eb1850d 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6489,11 +6489,11 @@ int RGWDeleteMultiObj::verify_permission()
       }
     }
 
-    bool empty = s->object.empty() || s->object.instance.empty();
+    bool not_versioned = s->object.empty() || s->object.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));
@@ -6504,7 +6504,7 @@ int RGWDeleteMultiObj::verify_permission()
     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));