update ceph source to reef 18.1.2

[ceph.git] / ceph / src / librbd / managed_lock / GetLockerRequest.cc

diff --git a/ceph/src/librbd/managed_lock/GetLockerRequest.cc b/ceph/src/librbd/managed_lock/GetLockerRequest.cc
index 6b2c27342bff1a912639ee9ca0cae8db1bf21e61..ea898ab96fdecd75d50326f2cf5282ce3cb2187a 100644 (file)
--- a/ceph/src/librbd/managed_lock/GetLockerRequest.cc
+++ b/ceph/src/librbd/managed_lock/GetLockerRequest.cc
@@ -103,14 +103,14 @@ void GetLockerRequest<I>::handle_get_lockers(int r) {
     return;
   }
 
+  if (iter->second.addr.is_blank_ip()) {
+    ldout(m_cct, 5) << "locker has a blank address" << dendl;
+    finish(-EBUSY);
+    return;
+  }
   m_locker->entity = iter->first.locker;
   m_locker->cookie = iter->first.cookie;
   m_locker->address = iter->second.addr.get_legacy_str();
-  if (m_locker->cookie.empty() || m_locker->address.empty()) {
-    ldout(m_cct, 20) << "no valid lockers detected" << dendl;
-    finish(-ENOENT);
-    return;
-  }
 
   ldout(m_cct, 10) << "retrieved exclusive locker: "
                  << m_locker->entity << "@" << m_locker->address << dendl;