From 4c50f6a7fc57fbbe1098e999a86572c4895cc8f0 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 29 Jan 2015 16:24:33 -0800 Subject: [PATCH] rgw: more merge related fixes Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 6efb129548c0..1fa3875c782c 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1988,7 +1988,7 @@ next: return EINVAL; } RGWBucketInfo bucket_info; - int ret = init_bucket(bucket_name, bucket_info, bucket); + int ret = init_bucket(bucket_name, bucket_id, bucket_info, bucket); if (ret < 0) { cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; return -ret; @@ -2035,7 +2035,7 @@ next: if (opt_cmd == OPT_BI_GET) { RGWBucketInfo bucket_info; - int ret = init_bucket(bucket_name, bucket_info, bucket); + int ret = init_bucket(bucket_name, bucket_id, bucket_info, bucket); if (ret < 0) { cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; return -ret; @@ -2059,7 +2059,7 @@ next: if (opt_cmd == OPT_BI_PUT) { RGWBucketInfo bucket_info; - int ret = init_bucket(bucket_name, bucket_info, bucket); + int ret = init_bucket(bucket_name, bucket_id, bucket_info, bucket); if (ret < 0) { cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; return -ret; @@ -2084,7 +2084,7 @@ next: if (opt_cmd == OPT_BI_LIST) { RGWBucketInfo bucket_info; - int ret = init_bucket(bucket_name, bucket_info, bucket); + int ret = init_bucket(bucket_name, bucket_id, bucket_info, bucket); if (ret < 0) { cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; return -ret; -- 2.47.3