rgw: use new instance handler for bucket operations

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 3bce4cd4c0b9bdb01a7584f00923af5e381053f7..5d3019e06344e808ea6bc2497f7b840f84ef0ce0 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -127,6 +127,12 @@ int rgw_bucket_store_info(RGWRados *store, string& bucket_name, bufferlist& bl,
   return store->meta_mgr->put_entry(bucket_meta_handler, bucket_name, bl, exclusive, objv_tracker, mtime, pattrs);
 }
 
+int rgw_bucket_instance_store_info(RGWRados *store, string& oid, bufferlist& bl, bool exclusive,
+                          map<string, bufferlist> *pattrs, RGWObjVersionTracker *objv_tracker,
+                          time_t mtime) {
+  return store->meta_mgr->put_entry(bucket_instance_meta_handler, oid, bl, exclusive, objv_tracker, mtime, pattrs);
+}
+
 #warning removed RGWBucket::create_bucket(), clean this up when ready
 #if 0
 int RGWBucket::create_bucket(string bucket_str, string& user_id, string& region_name, string& display_name)

diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h
index 09ddc653f73fad27973071be19ac201a606bf589..3d8ea26539643bc5396d1bd33b16114eb9929a25 100644 (file)
--- a/src/rgw/rgw_bucket.h
+++ b/src/rgw/rgw_bucket.h
@@ -25,6 +25,9 @@ extern void rgw_get_buckets_obj(string& user_id, string& buckets_obj_id);
 extern int rgw_bucket_store_info(RGWRados *store, string& bucket_name, bufferlist& bl, bool exclusive,
                                  map<string, bufferlist> *pattrs, RGWObjVersionTracker *objv_tracker,
                                  time_t mtime);
+extern int rgw_bucket_instance_store_info(RGWRados *store, string& oid, bufferlist& bl, bool exclusive,
+                                 map<string, bufferlist> *pattrs, RGWObjVersionTracker *objv_tracker,
+                                 time_t mtime);
 
 extern int rgw_bucket_delete_bucket_obj(RGWRados *store, string& bucket_name, RGWObjVersionTracker& objv_tracker);
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 2e490dea13ced8b84abd43e28274f2793e3292b8..c883e74f44a5fdf36d5b9a03097bfa30e4a6c413 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4577,7 +4577,7 @@ int RGWRados::put_bucket_instance_info(string& bucket_name, RGWBucketInfo& info,
 
   string oid;
   get_bucket_meta_oid(info.bucket, oid);
-  return rgw_bucket_store_info(this, oid, bl, exclusive, pattrs, &info.objv_tracker, mtime);
+  return rgw_bucket_instance_store_info(this, oid, bl, exclusive, pattrs, &info.objv_tracker, mtime);
 }
 
 int RGWRados::put_bucket_info(string& bucket_name, RGWBucketInfo& info, bool exclusive,