From: Jason Dillaman <dillaman@redhat.com>
Date: Sun, 1 Mar 2015 05:42:48 +0000 (-0500)
Subject: librbd: hide flush log message if no flushes are pending
X-Git-Tag: v0.94~65^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed9e3582442da1a0981d1ed5838a06953d70e580;p=ceph.git

librbd: hide flush log message if no flushes are pending

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/AsyncOperation.cc b/src/librbd/AsyncOperation.cc
index 2f0ef81e4181..dfb1e61a1009 100644
--- a/src/librbd/AsyncOperation.cc
+++ b/src/librbd/AsyncOperation.cc
@@ -29,7 +29,7 @@ void AsyncOperation::finish_op() {
     assert(m_xlist_item.remove_myself());
 
     // linked list stored newest -> oldest ops
-    if (!iter.end()) {
+    if (!iter.end() && !m_flush_contexts.empty()) {
       ldout(m_image_ctx->cct, 20) << "moving flush contexts to previous op: "
                                   << *iter << dendl;
       (*iter)->m_flush_contexts.insert((*iter)->m_flush_contexts.end(),