From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 5 Jan 2016 00:57:16 +0000 (+0800)
Subject: os:fix returned type of _do_transaction
X-Git-Tag: v10.0.3~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22aa547a22465a93371c13a37992e730e6b2a1c1;p=ceph.git

os:fix returned type of _do_transaction

As _do_transaction will never be able to return a negative result code.
It always return zero actually.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/keyvaluestore/KeyValueStore.cc b/src/os/keyvaluestore/KeyValueStore.cc
index 2b0635808c8..4b9f7932b76 100644
--- a/src/os/keyvaluestore/KeyValueStore.cc
+++ b/src/os/keyvaluestore/KeyValueStore.cc
@@ -1213,9 +1213,7 @@ int KeyValueStore::_do_transactions(list<Transaction*> &tls, uint64_t op_seq,
   for (list<Transaction*>::iterator p = tls.begin();
        p != tls.end();
        ++p, trans_num++) {
-    r = _do_transaction(**p, bt, handle);
-    if (r < 0)
-      break;
+    _do_transaction(**p, bt, handle);
     if (handle)
       handle->reset_tp_timeout();
   }
@@ -1228,7 +1226,7 @@ int KeyValueStore::_do_transactions(list<Transaction*> &tls, uint64_t op_seq,
   return r;
 }
 
-unsigned KeyValueStore::_do_transaction(Transaction& transaction,
+void KeyValueStore::_do_transaction(Transaction& transaction,
                                         BufferTransaction &t,
                                         ThreadPool::TPHandle *handle)
 {
@@ -1600,8 +1598,6 @@ unsigned KeyValueStore::_do_transaction(Transaction& transaction,
 
     op_num++;
   }
-
-  return 0;  // FIXME count errors
 }
 
 
diff --git a/src/os/keyvaluestore/KeyValueStore.h b/src/os/keyvaluestore/KeyValueStore.h
index ff272f1c247..9e245ee3808 100644
--- a/src/os/keyvaluestore/KeyValueStore.h
+++ b/src/os/keyvaluestore/KeyValueStore.h
@@ -526,7 +526,7 @@ class KeyValueStore : public ObjectStore,
   int do_transactions(list<Transaction*> &tls, uint64_t op_seq) {
     return _do_transactions(tls, op_seq, 0);
   }
-  unsigned _do_transaction(Transaction& transaction,
+  void _do_transaction(Transaction& transaction,
                            BufferTransaction &bt,
                            ThreadPool::TPHandle *handle);