From 3c772925ca93901bdaa4b45b041e28b501abe8eb Mon Sep 17 00:00:00 2001 From: runsisi Date: Sat, 9 Apr 2016 11:03:56 +0800 Subject: [PATCH] journal: fix final result for JournalTrimmer::C_RemoveSet if the first journal object got removed successfully while later objects failed then the final result should be set to fail Signed-off-by: runsisi --- src/journal/JournalTrimmer.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc index 68ba5f42ab4e1..74df78abc4fbc 100644 --- a/src/journal/JournalTrimmer.cc +++ b/src/journal/JournalTrimmer.cc @@ -194,7 +194,8 @@ JournalTrimmer::C_RemoveSet::C_RemoveSet(JournalTrimmer *_journal_trimmer, void JournalTrimmer::C_RemoveSet::complete(int r) { lock.Lock(); - if (r < 0 && r != -ENOENT && return_value == -ENOENT) { + if (r < 0 && r != -ENOENT && + (return_value == -ENOENT || return_value == 0)) { return_value = r; } else if (r == 0 && return_value == -ENOENT) { return_value = 0; -- 2.39.5