journaler: fix do_flush adjustment

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index a796c70cd5ad2314d1dbb388f36753d717cc0922..e1620cf0e6824c8ad280d1154074ca8d1f93607c 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -478,9 +478,11 @@ void Journaler::_do_flush(unsigned amount)
       waiting_for_zero = true;
       return;
     }
-    dout(10) << "_do_flush wanted to do " << flush_pos << "~" << len << " but hit prezero_pos " << prezero_pos
-            << ", will do " << flush_pos << "~" << newlen << dendl;
-    len = newlen;
+    if (newlen < len) {
+      dout(10) << "_do_flush wanted to do " << flush_pos << "~" << len << " but hit prezero_pos " << prezero_pos
+              << ", will do " << flush_pos << "~" << newlen << dendl;
+      len = newlen;
+    }
   }
   dout(10) << "_do_flush flushing " << flush_pos << "~" << len << dendl;