LU-10212 test: ESTALE read

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

diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index 4c1ac07..623563c 100644 (file)
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2010, 2013, Intel Corporation.
+ * Copyright (c) 2010, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -678,6 +678,8 @@ void ldlm_lock_prolong_one(struct ldlm_lock *lock,
 {
        time64_t timeout;
 
+       OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_PROLONG_PAUSE, 3);
+
        if (arg->lpa_export != lock->l_export ||
            lock->l_flags & LDLM_FL_DESTROYED)
                /* ignore unrelated locks */
@@ -790,7 +792,6 @@ int ldlm_process_extent_lock(struct ldlm_lock *lock, __u64 *flags,
        ENTRY;
 
        LASSERT(lock->l_granted_mode != lock->l_req_mode);
-       LASSERT(list_empty(&res->lr_converting));
        LASSERT(!(*flags & LDLM_FL_DENY_ON_CONTENTION) ||
                !ldlm_is_ast_discard_data(lock));
        INIT_LIST_HEAD(&rpc_list);