]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix for versioned delete_multi_object 12320/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 1 Dec 2016 18:53:44 +0000 (13:53 -0500)
committerLoic Dachary <ldachary@redhat.com>
Mon, 5 Dec 2016 14:56:36 +0000 (15:56 +0100)
Fixes: http://tracker.ceph.com/issues/17888
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit cc2d1e6100081aaca300ade51617294a37d33b9f)

src/rgw/rgw_op.cc

index 79e244a1f558a7dbd92843b39b9a10d08c23cc99..cdff54742c3695bb058dabf5a677bda9bef02fc1 100644 (file)
@@ -4449,8 +4449,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);