From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 7 Apr 2016 22:43:19 +0000 (+0200)
Subject: rgw: fix problem deleting objects begining with double underscore
X-Git-Tag: v10.1.2~25^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8488%2Fhead;p=ceph.git

rgw: fix problem deleting objects begining with double underscore

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

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 66ecd5568d28..8afde094a30b 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2994,7 +2994,8 @@ void RGWDeleteObj::execute()
     return;
   }
 
-  rgw_obj obj(s->bucket, s->object);
+  rgw_obj obj(s->bucket, s->object.name);
+  obj.set_instance(s->object.instance);
   map<string, bufferlist> attrs;