LU-6271 osc: handle osc eviction correctly

[fs/lustre-release.git] / lustre / ldlm / ldlm_lock.c

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index d75352c..39abaef 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -1207,8 +1207,7 @@ static int lock_matches(struct ldlm_lock *lock, struct lock_match_data *data)
        if (!data->lmd_unref && LDLM_HAVE_MASK(lock, GONE))
                return INTERVAL_ITER_CONT;
 
-       if ((data->lmd_flags & LDLM_FL_LOCAL_ONLY) &&
-           !ldlm_is_local(lock))
+       if (!equi(data->lmd_flags & LDLM_FL_LOCAL_ONLY, ldlm_is_local(lock)))
                return INTERVAL_ITER_CONT;
 
        if (data->lmd_flags & LDLM_FL_TEST_LOCK) {