mds: fix neighbor lock check

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index 45659804226d488fb23cc4e353e81edc11e900c7..9455a89404018eeb38fffeef38a4e20b3c8663ca 100644 (file)
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -418,8 +418,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);
     }