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>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index aae7d31e21ccc1f1e2f105fb51f707169f6a5a01..7b22f44790b74f9dbb1405fb205f077f44e1c123 100644 (file)
--- 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 6a9d2319de78de35ed97480c4baac08f433421b8..17a3aaa8439d536d4e9ef0e097b889ef9b17e200 100644 (file)
--- 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 e3312d9d3735d1db57167d9bdf89595f2c90ddcd..087fdcf8e09935003fa1afe099152e69ce724581 100644 (file)
--- 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 e083879b5825fca6781a0b008212bc2d6e9dba01..6422c182adc5deb959c0318fc9ee605410d4706d 100644 (file)
--- 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.