LU-2906 ldlm: use accessor macros for l_flags

[fs/lustre-release.git] / lustre / llite / dcache.c

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 7ea2f73..2518b6a 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -131,11 +131,8 @@ int ll_dcompare(struct dentry *parent, struct qstr *d_name, struct qstr *name)
 
 static inline int return_if_equal(struct ldlm_lock *lock, void *data)
 {
-        if ((lock->l_flags &
-             (LDLM_FL_CANCELING | LDLM_FL_DISCARD_DATA)) ==
-            (LDLM_FL_CANCELING | LDLM_FL_DISCARD_DATA))
-                return LDLM_ITER_CONTINUE;
-        return LDLM_ITER_STOP;
+       return (ldlm_is_canceling(lock) && ldlm_is_discard_data(lock)) ?
+               LDLM_ITER_CONTINUE : LDLM_ITER_STOP;
 }
 
 /* find any ldlm lock of the inode in mdc and lov