From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jul 2015 13:12:14 +0000 (-0400)
Subject: osdc/WritebackHandler: remove obsolete lock operation
X-Git-Tag: v9.1.0~365^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11631a509267bd19fea63397a4d584f86fbadef9;p=ceph.git

osdc/WritebackHandler: remove obsolete lock operation

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/client/ObjecterWriteback.h b/src/client/ObjecterWriteback.h
index b9e6f9c3cf1d..8c05e969076d 100644
--- a/src/client/ObjecterWriteback.h
+++ b/src/client/ObjecterWriteback.h
@@ -39,13 +39,6 @@ class ObjecterWriteback : public WritebackHandler {
 						    m_finisher));
   }
 
-  virtual ceph_tid_t lock(const object_t& oid, const object_locator_t& oloc, int op,
-		     int flags, Context *onack, Context *oncommit) {
-    return m_objecter->lock(oid, oloc, op, flags, onack,
-			    new C_OnFinisher(new C_Lock(m_lock, oncommit),
-					     m_finisher));
-  }
-
  private:
   Objecter *m_objecter;
   Finisher *m_finisher;
diff --git a/src/osdc/WritebackHandler.h b/src/osdc/WritebackHandler.h
index fe7d977de26e..cbcf20dbcdc7 100644
--- a/src/osdc/WritebackHandler.h
+++ b/src/osdc/WritebackHandler.h
@@ -33,10 +33,6 @@ class WritebackHandler {
 			   const bufferlist &bl, utime_t mtime,
 			   uint64_t trunc_size, __u32 trunc_seq,
 			   Context *oncommit) = 0;
-  virtual ceph_tid_t lock(const object_t& oid, const object_locator_t& oloc,
-			  int op, int flags, Context *onack, Context *oncommit) {
-    assert(0 == "this WritebackHandler does not support the lock operation");
-  }
 
   virtual void get_client_lock() {}
   virtual void put_client_lock() {}