From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Dec 2014 22:11:54 +0000 (-0800)
Subject: librados: remove IoCtxImpl lock member
X-Git-Tag: v0.91~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c55d7da4f488ae5febb05c2b9be69cb366b5fb0b;p=ceph.git

librados: remove IoCtxImpl lock member

It is dead!

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

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index d1ddc294ccf9..bd410412618f 100644
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -28,18 +28,18 @@
 librados::IoCtxImpl::IoCtxImpl() :
   ref_cnt(0), client(NULL), poolid(0), assert_ver(0), last_objver(0),
   notify_timeout(30), aio_write_list_lock("librados::IoCtxImpl::aio_write_list_lock"),
-  aio_write_seq(0), lock(NULL), objecter(NULL)
+  aio_write_seq(0), objecter(NULL)
 {
 }
 
 librados::IoCtxImpl::IoCtxImpl(RadosClient *c, Objecter *objecter,
-			       Mutex *client_lock, int poolid,
+			       int poolid,
 			       const char *pool_name, snapid_t s)
   : ref_cnt(0), client(c), poolid(poolid), pool_name(pool_name), snap_seq(s),
     assert_ver(0), notify_timeout(c->cct->_conf->client_notify_timeout),
     oloc(poolid),
     aio_write_list_lock("librados::IoCtxImpl::aio_write_list_lock"),
-    aio_write_seq(0), lock(client_lock), objecter(objecter)
+    aio_write_seq(0), objecter(objecter)
 {
 }
 
diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
index a5c0874e2af4..4235f13a4af8 100644
--- a/src/librados/IoCtxImpl.h
+++ b/src/librados/IoCtxImpl.h
@@ -47,11 +47,10 @@ struct librados::IoCtxImpl {
   xlist<AioCompletionImpl*> aio_write_list;
   map<ceph_tid_t, std::list<AioCompletionImpl*> > aio_write_waiters;
 
-  Mutex *lock;
   Objecter *objecter;
 
   IoCtxImpl();
-  IoCtxImpl(RadosClient *c, Objecter *objecter, Mutex *client_lock,
+  IoCtxImpl(RadosClient *c, Objecter *objecter,
 	    int poolid, const char *pool_name, snapid_t s);
 
   void dup(const IoCtxImpl& rhs) {
@@ -66,7 +65,6 @@ struct librados::IoCtxImpl {
     last_objver = rhs.last_objver;
     notify_timeout = rhs.notify_timeout;
     oloc = rhs.oloc;
-    lock = rhs.lock;
     objecter = rhs.objecter;
   }
 
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index ae06368b1fad..cce899a9866f 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -338,8 +338,7 @@ int librados::RadosClient::create_ioctx(const char *name, IoCtxImpl **io)
     }
   }
 
-  *io = new librados::IoCtxImpl(this, objecter, &lock, poolid, name,
-				CEPH_NOSNAP);
+  *io = new librados::IoCtxImpl(this, objecter, poolid, name, CEPH_NOSNAP);
   return 0;
 }