From d2523b82c5c7b29293d70a66ba95493a1564a840 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 15 Oct 2014 12:03:46 +0800 Subject: [PATCH] mds: fix neighbor lock check Signed-off-by: Yan, Zheng (cherry picked from commit b0e6e85aa08ea74cd209aad04f3f0bf991761e12) --- src/mds/flock.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mds/flock.cc b/src/mds/flock.cc index f12fc08f9f669..2849c1c9d3b5c 100644 --- 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); } -- 2.39.5