From: Sage Weil <sage@redhat.com>
Date: Sat, 30 Apr 2016 02:12:38 +0000 (-0400)
Subject: os/kstore: fix submit_transaction rval checks
X-Git-Tag: v11.0.0~643^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34e17e5cd400a7a8bc0af74f03e70d27449192c5;p=ceph.git

os/kstore: fix submit_transaction rval checks

No side effects in assert

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

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 5757109f413b..a98396f492c4 100644
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -2185,13 +2185,18 @@ void KStore::_txc_state_proc(TransContext *txc)
       txc->state = TransContext::STATE_KV_QUEUED;
       if (!g_conf->kstore_sync_transaction) {
 	std::lock_guard<std::mutex> l(kv_lock);
-	if (g_conf->kstore_sync_submit_transaction)
-          assert(0 == db->submit_transaction(txc->t));
+	if (g_conf->kstore_sync_submit_transaction) {
+          int r = db->submit_transaction(txc->t);
+	  assert(r == 0);
+	}
 	kv_queue.push_back(txc);
 	kv_cond.notify_one();
 	return;
       }
-      assert(0 == db->submit_transaction_sync(txc->t));
+      {
+	int r = db->submit_transaction_sync(txc->t);
+	assert(r == 0);
+      }
       break;
 
     case TransContext::STATE_KV_QUEUED:
@@ -2352,10 +2357,12 @@ void KStore::_kv_sync_thread()
 	for (std::deque<TransContext *>::iterator it = kv_committing.begin();
 	     it != kv_committing.end();
 	     ++it) {
-	  assert(0 == db->submit_transaction((*it)->t));
+	  int r = db->submit_transaction((*it)->t);
+	  assert(r == 0);
 	}
       }
-      assert(0 == db->submit_transaction_sync(t));
+      int r = db->submit_transaction_sync(t);
+      assert(r == 0);
       utime_t finish = ceph_clock_now(NULL);
       utime_t dur = finish - start;
       dout(20) << __func__ << " committed " << kv_committing.size()