diff options
author | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-19 13:06:53 -0700 |
---|---|---|
committer | Greg Farnum <greg@inktank.com> | 2013-07-19 13:21:50 -0700 |
commit | da8584f15f220ebde1015a1dcf52954b26287bea (patch) | |
tree | b9cc4a8b8dba32d018ddef485a25901345ce7484 | |
parent | d44082e421c7caa9637a6e42957dee64c1ce4e9e (diff) | |
download | ceph-da8584f15f220ebde1015a1dcf52954b26287bea.tar.gz |
rgw: remove extra unused param from RGWRados::get_attr()
No user for the extra obj_version param.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r-- | src/rgw/rgw_bucket.cc | 2 | ||||
-rw-r--r-- | src/rgw/rgw_op.cc | 4 | ||||
-rw-r--r-- | src/rgw/rgw_rados.cc | 9 | ||||
-rw-r--r-- | src/rgw/rgw_rados.h | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index aae7d31e21c..7b22f44790b 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -718,7 +718,7 @@ int RGWBucket::get_policy(RGWBucketAdminOpState& op_state, ostream& o) bufferlist bl; rgw_obj obj(bucket, object_name); - int ret = store->get_attr(NULL, obj, RGW_ATTR_ACL, bl, NULL); + int ret = store->get_attr(NULL, obj, RGW_ATTR_ACL, bl); if (ret < 0) return ret; diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 6a9d2319de7..17a3aaa8439 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -207,7 +207,7 @@ static int get_obj_policy_from_attr(CephContext *cct, RGWRados *store, void *ctx bufferlist bl; int ret = 0; - ret = store->get_attr(ctx, obj, RGW_ATTR_ACL, bl, NULL); + ret = store->get_attr(ctx, obj, RGW_ATTR_ACL, bl); if (ret >= 0) { ret = decode_policy(cct, bl, policy); if (ret < 0) @@ -2499,7 +2499,7 @@ int RGWHandler::read_cors_config(void) string no_object; rgw_obj no_obj(s->bucket, no_object); if (no_obj.bucket.name.size()) { - ret = store->get_attr(s->obj_ctx, no_obj, RGW_ATTR_CORS, bl, NULL); + ret = store->get_attr(s->obj_ctx, no_obj, RGW_ATTR_CORS, bl); if (ret >= 0) { bufferlist::iterator iter = bl.begin(); s->bucket_cors = new RGWCORSConfiguration(); diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index e3312d9d373..087fdcf8e09 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3265,8 +3265,7 @@ int RGWRados::get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state * dest: bufferlist to store the result in * Returns: 0 on success, -ERR# otherwise. */ -int RGWRados::get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& dest, - RGWObjVersionTracker *objv_tracker) +int RGWRados::get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& dest) { rgw_bucket bucket; std::string oid, key; @@ -3301,10 +3300,6 @@ int RGWRados::get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& de ObjectReadOperation op; - if (objv_tracker) { - objv_tracker->prepare_op_for_read(&op); - } - int rval; op.getxattr(name, &dest, &rval); @@ -3604,7 +3599,7 @@ int RGWRados::prepare_get_obj(void *ctx, rgw_obj& obj, } } if (if_match || if_nomatch) { - r = get_attr(rctx, obj, RGW_ATTR_ETAG, etag, NULL); + r = get_attr(rctx, obj, RGW_ATTR_ETAG, etag); if (r < 0) goto done_err; diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index e083879b582..6422c182adc 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -1157,8 +1157,7 @@ public: * dest: bufferlist to store the result in * Returns: 0 on success, -ERR# otherwise. */ - virtual int get_attr(void *ctx, rgw_obj& obj, const char *name, - bufferlist& dest, RGWObjVersionTracker *objv_tracker); + virtual int get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& dest); /** * Set an attr on an object. |