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

os: fix returned type of _do_transaction

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

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index d3fab73c4e87..9193b75e6ee1 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -2081,20 +2081,17 @@ int FileStore::_do_transactions(
   uint64_t op_seq,
   ThreadPool::TPHandle *handle)
 {
-  int r = 0;
   int trans_num = 0;
 
   for (list<Transaction*>::iterator p = tls.begin();
        p != tls.end();
        ++p, trans_num++) {
-    r = _do_transaction(**p, op_seq, trans_num, handle);
-    if (r < 0)
-      break;
+    _do_transaction(**p, op_seq, trans_num, handle);
     if (handle)
       handle->reset_tp_timeout();
   }
 
-  return r;
+  return 0;
 }
 
 void FileStore::_set_global_replay_guard(coll_t cid,
@@ -2355,7 +2352,7 @@ int FileStore::_check_replay_guard(int fd, const SequencerPosition& spos)
   }
 }
 
-unsigned FileStore::_do_transaction(
+void FileStore::_do_transaction(
   Transaction& t, uint64_t op_seq, int trans_num,
   ThreadPool::TPHandle *handle)
 {
@@ -2875,8 +2872,6 @@ unsigned FileStore::_do_transaction(
   }
 
   _inject_failure();
-
-  return 0;  // FIXME count errors
 }
 
   /*********************************************/
diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h
index cb77287f4c6f..52714f967847 100644
--- a/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@ -462,7 +462,7 @@ public:
   int do_transactions(list<Transaction*> &tls, uint64_t op_seq) {
     return _do_transactions(tls, op_seq, 0);
   }
-  unsigned _do_transaction(
+  void _do_transaction(
     Transaction& t, uint64_t op_seq, int trans_num,
     ThreadPool::TPHandle *handle);