LU-12458 kernel: kernel update RHEL7.6 [3.10.0-957.21.3.el7]

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

diff --git a/lustre/ldlm/ldlm_inodebits.c b/lustre/ldlm/ldlm_inodebits.c
index c5d5d5a..4d66c20 100644 (file)
--- a/lustre/ldlm/ldlm_inodebits.c
+++ b/lustre/ldlm/ldlm_inodebits.c
@@ -57,6 +57,7 @@
 #include "ldlm_internal.h"
 
 #ifdef HAVE_SERVER_SUPPORT
+
 /**
  * Determine if the lock is compatible with all locks on the queue.
  *
@@ -209,7 +210,7 @@ int ldlm_process_inodebits_lock(struct ldlm_lock *lock, __u64 *flags,
 
        ENTRY;
 
-       LASSERT(lock->l_granted_mode != lock->l_req_mode);
+       LASSERT(!ldlm_is_granted(lock));
        check_res_locked(res);
 
        if (intention == LDLM_PROCESS_RESCAN) {