Merge pull request #8516 from runsisi/wip-fix-ret

journal: fix final result for JournalTrimmer::C_RemoveSet Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Apr 9, 2016 · 30e943a · 30e943a
2 parents 7a94d97 + 3c77292
commit 30e943a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;