diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-23 21:16:14 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-23 21:16:14 -0700 |
| commit | 4e90c5ec2963728b29e378a8b10f4a95bb6c0102 (patch) | |
| tree | e0dab00dc39bd9f685678a55d4cb4890ac0765fc | |
| parent | 71869c4b9edc13bac3333ae86fd6280fded113db (diff) | |
| download | ceph-4e90c5ec2963728b29e378a8b10f4a95bb6c0102.tar.gz | |
rgw: use new instance handler for bucket operations
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/rgw/rgw_bucket.cc | 6 | ||||
| -rw-r--r-- | src/rgw/rgw_bucket.h | 3 | ||||
| -rw-r--r-- | src/rgw/rgw_rados.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 3bce4cd4c0b..5d3019e0634 100644 --- 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 09ddc653f73..3d8ea265396 100644 --- 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 2e490dea13c..c883e74f44a 100644 --- 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, |