]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: set correct instance on the object 11563/head
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Sep 2016 01:35:59 +0000 (18:35 -0700)
committerOrit Wasserman <owasserm@redhat.com>
Wed, 19 Oct 2016 21:25:47 +0000 (23:25 +0200)
Fixes: http://tracker.ceph.com/issues/17443
This was broken by commit bc840afafdfe5e528e5c1b711e71420ac3cb5a67

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d2ada35c8c0d938a704ecf9974988ea30a9c0105)

src/rgw/rgw_op.cc

index 61d3d74d94c705cedc11d69c7af847b472bb296f..76c2428c341be3696e07c0906ae311b657a647b3 100644 (file)
@@ -264,7 +264,7 @@ static int read_policy(RGWRados *store, struct req_state *s,
     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()) {