Cleanup up useless method release in MultiAioCompletionImpl. It was exactly equivalen...

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

diff --git a/src/libradosstriper/MultiAioCompletionImpl.h b/src/libradosstriper/MultiAioCompletionImpl.h
index 6ad8ed09f15937520e09d133367bcd30a98d48ec..f9c6153381c38c30dc4e699ab0b9b26cdc125734 100644 (file)
--- 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 2460999eb31938d9a282b655154fa35c7b8df273..463a722008e6ef06f53abfcf28429259977bf986 100644 (file)
--- 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 e02c8ca54320c2534c6bf6f0a7ff347224ff3a3a..44079b5f4e267e85b1a433fa956ab477db2c67f9 100644 (file)
--- 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;
 }