From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 12 Oct 2016 12:55:52 +0000 (-0400)
Subject: rgw: get_system_obj does not use result of get_system_obj_state
X-Git-Tag: v10.2.6~36^2~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11867%2Fhead;p=ceph.git

rgw: get_system_obj does not use result of get_system_obj_state

get_system_obj() calls get_system_obj_state() to send a [getxattrs,stat]
request and fill out an RGWObjState - but the results are not used

Fixes: http://tracker.ceph.com/issues/17580

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 973d0076958ec9416cbe9ebc1cec03ee147ca4f9)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 3f348502d127..e4a1a2efbdf4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -9057,14 +9057,8 @@ int RGWRados::get_system_obj(RGWObjectCtx& obj_ctx, RGWRados::SystemObject::Read
   uint64_t len;
   ObjectReadOperation op;
 
-  RGWObjState *astate = NULL;
-
   get_obj_bucket_and_oid_loc(obj, bucket, oid, key);
 
-  int r = get_system_obj_state(&obj_ctx, obj, &astate, NULL);
-  if (r < 0)
-    return r;
-
   if (end < 0)
     len = 0;
   else
@@ -9082,7 +9076,7 @@ int RGWRados::get_system_obj(RGWObjectCtx& obj_ctx, RGWRados::SystemObject::Read
   }
 
   librados::IoCtx *io_ctx;
-  r = read_state.get_ioctx(this, obj, &io_ctx);
+  int r = read_state.get_ioctx(this, obj, &io_ctx);
   if (r < 0) {
     ldout(cct, 20) << "get_ioctx() on obj=" << obj << " returned " << r << dendl;
     return r;