From: Kefu Chai <kchai@redhat.com>
Date: Tue, 15 Dec 2015 04:28:13 +0000 (+0800)
Subject: rgw: fix the build failure
X-Git-Tag: v10.0.2~34^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a57784f75fc0355d9a39d00f5d97d677ed4961fe;p=ceph.git

rgw: fix the build failure

* s/bucket_name_str/bucket_name/
* the member variable name of `req_state` was changed to `bucket_name`
  in f7ca00a. but some commits was still using the old name before the
  commit got merged.
* fixes for the tenant related change
* also fixes a typo

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 17a4cdeec236..d1e8b71cc266 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1020,7 +1020,8 @@ int RGWGetObj::handle_slo_manifest(bufferlist& bl)
         RGWBucketInfo bucket_info;
         map<string, bufferlist> bucket_attrs;
         RGWObjectCtx obj_ctx(store);
-        int r = store->get_bucket_info(obj_ctx, bucket_name, bucket_info, NULL, &bucket_attrs);
+        int r = store->get_bucket_info(obj_ctx, s->user.user_id.tenant,
+              bucket_name, bucket_info, NULL, &bucket_attrs);
         if (r < 0) {
           ldout(s->cct, 0) << "could not get bucket info for bucket=" << bucket_name << dendl;
           return r;
@@ -2729,9 +2730,9 @@ int RGWDeleteObj::handle_slo_manifest(bufferlist& bl)
     items.push_back(path);
   }
 
-  /* Request removal of the manifet object itself. */
+  /* Request removal of the manifest object itself. */
   RGWBulkDelete::acct_path_t path;
-  path.bucket_name = s->bucket_name_str;
+  path.bucket_name = s->bucket_name;
   path.obj_key = s->object;
   items.push_back(path);
 
@@ -4125,7 +4126,8 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path)
 
   RGWBucketInfo binfo;
   map<string, bufferlist> battrs;
-  ret = store->get_bucket_info(obj_ctx, path.bucket_name, binfo, NULL, &battrs);
+  ret = store->get_bucket_info(obj_ctx, s->user.user_id.tenant,
+      path.bucket_name, binfo, NULL, &battrs);
   if (ret < 0) {
     goto binfo_fail;
   }
@@ -4162,7 +4164,7 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path)
 
     ret = store->delete_bucket(binfo.bucket, ot);
     if (0 == ret) {
-      ret = rgw_unlink_bucket(store, binfo.owner, binfo.bucket.name, false);
+      ret = rgw_unlink_bucket(store, binfo.owner, binfo.bucket.tenant, binfo.bucket.name, false);
       if (ret < 0) {
         ldout(s->cct, 0) << "WARNING: failed to unlink bucket: ret=" << ret << dendl;
       }
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 21a0336022bb..6fed37c9b9b1 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -819,7 +819,7 @@ void RGWDeleteObj_ObjStore_SWIFT::send_response()
       bulkdelete_respond(0, 1, {}, s->prot_flags, *s->formatter);
     } else {
       RGWBulkDelete::acct_path_t path;
-      path.bucket_name = s->bucket_name_str;
+      path.bucket_name = s->bucket_name;
       path.obj_key = s->object;
 
       RGWBulkDelete::fail_desc_t fail_desc;