From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 27 Apr 2017 20:53:37 +0000 (+0300)
Subject: rgw: remove RGWReshard::get_head
X-Git-Tag: ses5-milestone6~8^2~7^2~75
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7154a6a73f50292890a62d4a52e72e60bda7039;p=ceph.git

rgw: remove RGWReshard::get_head

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index dc67f574247..5385623b3ae 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -89,29 +89,6 @@ int RGWReshard::list(string& marker, uint32_t max, std::list<cls_rgw_reshard_ent
   return ret;
 }
 
-int RGWReshard::get_head(cls_rgw_reshard_entry& entry)
-{
-  rados::cls::lock::Lock l(reshard_lock_name);
-  librados::IoCtx io_ctx;
-
-  int ret = get_io_ctx(io_ctx);
-  if (ret < 0)
-    return ret;
-
-  ret = l.lock_shared(&io_ctx, reshard_oid);
-  if (ret == -EBUSY) {
-    ldout(cct, 0) << "RGWReshardLog::add failed to acquire lock on " << reshard_oid << dendl;
-    return 0;
-  }
-  if (ret < 0)
-    return ret;
-
-  ret = cls_rgw_reshard_get_head(io_ctx, reshard_oid, entry);
-
-  l.unlock(&io_ctx, reshard_oid);
-  return ret;
-}
-
 int RGWReshard::get(cls_rgw_reshard_entry& entry)
 {
   rados::cls::lock::Lock l(reshard_lock_name);
diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
index ddde84635ec..c2436acfbc1 100644
--- a/src/rgw/rgw_reshard.h
+++ b/src/rgw/rgw_reshard.h
@@ -25,7 +25,6 @@ class RGWReshard {
   public:
     RGWReshard(CephContext* cct, RGWRados* _store);
     int add(cls_rgw_reshard_entry& entry);
-    int get_head(cls_rgw_reshard_entry& entry);
     int get(cls_rgw_reshard_entry& entry);
     int remove(cls_rgw_reshard_entry& entry);
     int list(string& marker, uint32_t max, list<cls_rgw_reshard_entry>& entries, bool& is_truncated);