From f2d9fc015556d6d70e596f75c382cc7157add411 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Sat, 24 Sep 2016 10:33:57 -0700 Subject: [PATCH] rgw: rgw_link_bucket, use correct bucket structure for entry point The bucket structure might be different than the one that we were using before. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_bucket.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index b49c7477457b..199dc1a4041f 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -224,6 +224,7 @@ int rgw_link_bucket(RGWRados *store, const rgw_user& user_id, rgw_bucket& bucket ep.linked = true; ep.owner = user_id; + ep.bucket = bucket; ret = store->put_bucket_entrypoint_info(tenant_name, bucket_name, ep, false, ot, real_time(), &attrs); if (ret < 0) goto done_err; @@ -891,7 +892,7 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg) rgw_obj obj_bucket_instance(bucket_instance, no_oid); r = store->system_obj_set_attr(NULL, obj_bucket_instance, RGW_ATTR_ACL, aclbl, &objv_tracker); - r = rgw_link_bucket(store, user_info.user_id, bucket, real_time()); + r = rgw_link_bucket(store, user_info.user_id, bucket_info.bucket, real_time()); if (r < 0) return r; } -- 2.47.3