From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 30 Sep 2016 01:35:59 +0000 (-0700)
Subject: rgw: set correct instance on the object
X-Git-Tag: v11.0.1~59^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2ada35c8c0d938a704ecf9974988ea30a9c0105;p=ceph.git

rgw: set correct instance on the object

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

This was broken by commit bc840afafdfe5e528e5c1b711e71420ac3cb5a67

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 2c820e4030b4..4c913bc9cc22 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -311,7 +311,7 @@ static int read_policy(RGWRados *store,
     obj.set_in_extra_data(true);
   } else {
     obj = rgw_obj(bucket, object.name);
-    obj.set_instance(s->object.instance);
+    obj.set_instance(object.instance);
   }
   int ret = get_policy_from_attr(s->cct, store, s->obj_ctx, bucket_info, bucket_attrs, policy, obj);
   if (ret == -ENOENT && !object.empty()) {