LU-6852 ldlm: Do not evict MDS-MDS connection

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

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 34c210b..760feb5 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -444,6 +444,12 @@ static int ldlm_add_waiting_lock(struct ldlm_lock *lock)
        LASSERT(ldlm_is_res_locked(lock));
        LASSERT(!ldlm_is_cancel_on_block(lock));
 
+       /* Do not put cross-MDT lock in the waiting list, since we
+        * will not evict it due to timeout for now */
+       if (lock->l_export != NULL &&
+           (exp_connect_flags(lock->l_export) & OBD_CONNECT_MDS_MDS))
+               return 0;
+
        spin_lock_bh(&waiting_locks_spinlock);
        if (ldlm_is_cancel(lock)) {
                spin_unlock_bh(&waiting_locks_spinlock);
@@ -559,6 +565,12 @@ int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout)
                return 0;
        }
 
+       if (exp_connect_flags(lock->l_export) & OBD_CONNECT_MDS_MDS) {
+               /* We don't have a "waiting locks list" on OSP. */
+               LDLM_DEBUG(lock, "MDS-MDS lock: no-op");
+               return 0;
+       }
+
        spin_lock_bh(&waiting_locks_spinlock);
 
        if (list_empty(&lock->l_pending_chain)) {