From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 1 Dec 2016 18:53:44 +0000 (-0500)
Subject: rgw: fix for versioned delete_multi_object
X-Git-Tag: v11.1.0~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc2d1e6100081aaca300ade51617294a37d33b9f;p=ceph.git

rgw: fix for versioned delete_multi_object

Fixes: http://tracker.ceph.com/issues/17888

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 54838d8732777..9c6bd34c29200 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5242,8 +5242,8 @@ void RGWDeleteMultiObj::execute()
   for (iter = multi_delete->objects.begin();
         iter != multi_delete->objects.end() && num_processed < max_to_delete;
         ++iter, num_processed++) {
-    rgw_obj obj(bucket, (*iter).name);
-    obj.set_instance(s->object.instance);
+    rgw_obj obj(bucket, iter->name);
+    obj.set_instance(iter->instance);
 
     obj_ctx->set_atomic(obj);