From: Sebastien Ponce <sebastien.ponce@cern.ch>
Date: Wed, 15 Oct 2014 13:50:35 +0000 (+0200)
Subject: Cleanup up useless method release in MultiAioCompletionImpl. It was exactly equivalen... 
X-Git-Tag: v0.88~53^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5299db341b4d53f1a1ddb0c8bf70aadd8fd9d32d;p=ceph.git

Cleanup up useless method release in MultiAioCompletionImpl. It was exactly equivalent to put

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
---

diff --git a/src/libradosstriper/MultiAioCompletionImpl.h b/src/libradosstriper/MultiAioCompletionImpl.h
index 6ad8ed09f159..f9c6153381c3 100644
--- a/src/libradosstriper/MultiAioCompletionImpl.h
+++ b/src/libradosstriper/MultiAioCompletionImpl.h
@@ -25,7 +25,6 @@ struct libradosstriper::MultiAioCompletionImpl {
   Mutex lock;
   Cond cond;
   int ref, rval;
-  bool released;
   int pending_complete, pending_safe;
   rados_callback_t callback_complete, callback_safe;
   void *callback_complete_arg, *callback_safe_arg;
@@ -34,7 +33,7 @@ struct libradosstriper::MultiAioCompletionImpl {
   std::list<bufferlist*> bllist; /// keep temporary buffer lists used for destriping
 
   MultiAioCompletionImpl() : lock("MultiAioCompletionImpl lock", false, false),
-    ref(1), rval(0), released(false),
+    ref(1), rval(0),
     pending_complete(0), pending_safe(0),
     callback_complete(0), callback_safe(0),
     callback_complete_arg(0), callback_safe_arg(0),
@@ -120,12 +119,6 @@ struct libradosstriper::MultiAioCompletionImpl {
     lock.Unlock();
     return r;
   }
-  void release() {
-    lock.Lock();
-    assert(!released);
-    released = true;
-    put_unlock();
-  }
   void get() {
     lock.Lock();
     _get();
diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
index 2460999eb319..463a722008e6 100644
--- a/src/libradosstriper/RadosStriperImpl.cc
+++ b/src/libradosstriper/RadosStriperImpl.cc
@@ -669,7 +669,7 @@ int libradosstriper::RadosStriperImpl::write_in_open_object(const std::string& s
     rc = c->get_return_value();
   }
   delete cdata;
-  c->release();
+  c->put();
   return rc;
 }
 
diff --git a/src/libradosstriper/libradosstriper.cc b/src/libradosstriper/libradosstriper.cc
index e02c8ca54320..44079b5f4e26 100644
--- a/src/libradosstriper/libradosstriper.cc
+++ b/src/libradosstriper/libradosstriper.cc
@@ -108,7 +108,7 @@ int libradosstriper::MultiAioCompletion::get_return_value()
 void libradosstriper::MultiAioCompletion::release()
 {
   MultiAioCompletionImpl *c = (MultiAioCompletionImpl *)pc;
-  c->release();
+  c->put();
   delete this;
 }