From 2e41f084d48b9260ed090c12620027cf63aaecba Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 18 Apr 2011 15:32:43 -0700 Subject: [PATCH] journaler: fix do_flush adjustment Signed-off-by: Sage Weil --- src/osdc/Journaler.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index a796c70cd5ad2..e1620cf0e6824 100644 --- 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; -- 2.39.5