From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 5 Jun 2017 12:17:05 +0000 (-0400)
Subject: librbd: filter expected error codes from is_exclusive_lock_owner
X-Git-Tag: v11.2.1~52^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18f1830e8acaa386d0113171ec649b5b33698dd9;p=ceph.git

librbd: filter expected error codes from is_exclusive_lock_owner

Fixes: http://tracker.ceph.com/issues/20182
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d4daaf54e6bc42cd4fb2111ea20b2042941b0c31)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index f53a81edc25..5cc58cc26df 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1451,7 +1451,9 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
     // might have been blacklisted by peer -- ensure we still own
     // the lock by pinging the OSD
     int r = ictx->exclusive_lock->assert_header_locked();
-    if (r < 0) {
+    if (r == -EBUSY || r == -ENOENT) {
+      return 0;
+    } else if (r < 0) {
       return r;
     }