From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 15 Oct 2014 04:03:46 +0000 (+0800)
Subject: mds: fix neighbor lock check
X-Git-Tag: v0.88~63^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0e6e85aa08ea74cd209aad04f3f0bf991761e12;p=ceph.git

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 45659804226d..9455a8940401 100644
--- 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);
     }