mds: fix neighbor lock check

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit b0e6e85aa08ea74cd209aad04f3f0bf991761e12)

diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index f12fc08f9f669179ff83e69021f886b4637b0cb0..2849c1c9d3b5cdd04be4f07798e178cdca5ff579 100644 (file)
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -419,8 +419,7 @@ bool ceph_lock_state_t::get_overlapping_locks(ceph_filelock& lock,
     if (share_space(iter, lock)) {
       overlaps.push_front(iter);
     } else if (self_neighbors &&
-               (neighbor_check_lock.client == iter->second.client) &&
-               (neighbor_check_lock.pid == iter->second.pid) &&
+              ceph_filelock_owner_equal(neighbor_check_lock, iter->second) &&
                share_space(iter, neighbor_check_lock)) {
       self_neighbors->push_front(iter);
     }