From: Xinze Chi <xmdxcxz@gmail.com>
Date: Wed, 10 Dec 2014 17:00:43 +0000 (+0000)
Subject: os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher.
X-Git-Tag: v0.91~52^2~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3135%2Fhead;p=ceph.git

os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher.

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1bb4de96cdd..ae8dabfd37d 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1785,7 +1785,9 @@ void FileStore::_finish_op(OpSequencer *osr)
   if (o->onreadable) {
     op_finisher.queue(o->onreadable);
   }
-  op_finisher.queue(to_queue);
+  if (!to_queue.empty()) {
+    op_finisher.queue(to_queue);
+  }
   delete o;
 }
 
@@ -1935,7 +1937,9 @@ void FileStore::_journaled_ahead(OpSequencer *osr, Op *o, Context *ondisk)
     dout(10) << " queueing ondisk " << ondisk << dendl;
     ondisk_finisher.queue(ondisk);
   }
-  ondisk_finisher.queue(to_queue);
+  if (!to_queue.empty()) {
+    ondisk_finisher.queue(to_queue);
+  }
 }
 
 int FileStore::_do_transactions(