From: Kefu Chai Date: Sat, 30 May 2020 04:51:14 +0000 (+0800) Subject: rgw/reshard: use defined variable X-Git-Tag: wip-pdonnell-testing-20200918.022351~1117^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65e86f489f3cc7d628b83f70837fdb743535bf0c;p=ceph-ci.git rgw/reshard: use defined variable use the defined reference for more concise code, this silences the warning like: ``` ../src/rgw/rgw_reshard.cc:530:15: warning: unused variable ‘bucket’ [-Wunused-variable] 530 | rgw_bucket& bucket = bucket_info.bucket; | ^~~~~~ ``` also move `ret` close to where it is used for the first time. Signed-off-by: Kefu Chai --- diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc index bf2508b79ce..0a66d17c77f 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -527,14 +527,11 @@ int RGWBucketReshard::do_reshard(int num_shards, ostream *out, Formatter *formatter) { - rgw_bucket& bucket = bucket_info.bucket; - - int ret = 0; - if (out) { - (*out) << "tenant: " << bucket_info.bucket.tenant << std::endl; - (*out) << "bucket name: " << bucket_info.bucket.name << std::endl; - (*out) << "old bucket instance id: " << bucket_info.bucket.bucket_id << + const rgw_bucket& bucket = bucket_info.bucket; + (*out) << "tenant: " << bucket.tenant << std::endl; + (*out) << "bucket name: " << bucket.name << std::endl; + (*out) << "old bucket instance id: " << bucket.bucket_id << std::endl; (*out) << "new bucket instance id: " << new_bucket_info.bucket.bucket_id << std::endl; @@ -553,7 +550,7 @@ int RGWBucketReshard::do_reshard(int num_shards, // complete successfully BucketInfoReshardUpdate bucket_info_updater(store, bucket_info, bucket_attrs, new_bucket_info.bucket.bucket_id); - ret = bucket_info_updater.start(); + int ret = bucket_info_updater.start(); if (ret < 0) { ldout(store->ctx(), 0) << __func__ << ": failed to update bucket info ret=" << ret << dendl; return ret;