From a379430d1921a1e5a330b4bfe0189a9a21dc5f81 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 30 Jan 2017 17:41:51 -0500
Subject: [PATCH] journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 040004f53f7d334fc9452e3f5fd80169cad5f65e)
---
 src/journal/JournalTrimmer.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index 3a26fb32399cc..ec48f9aaed048 100644
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -79,8 +79,10 @@ void JournalTrimmer::remove_objects(bool force, Context *on_finish) {
 
         if (registered_clients.size() == 0) {
           on_finish->complete(-EINVAL);
+          return;
         } else if (registered_clients.size() > 1) {
           on_finish->complete(-EBUSY);
+          return;
         }
       }
 
-- 
2.39.5