Branch HEAD

b=17026
i=shadow
i=oleg

Description: (ptllnd_peer.c:557:kptllnd_peer_check_sends()) ASSERTION(!in_interrupt()) failed
Details: fix stack overflow in the distributed lock manager by defering export
         eviction after a failed ast to the elt thread instead of handling
         it in the dlm interpret routine.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 522fc71..c0d8a42 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1436,6 +1436,13 @@ Description: Lustre GPF in {:ptlrpc:ptlrpc_server_free_request+373}
 Details    : In case of memory pressure, list_del() can be called twice on
             req->rq_history_list, causing a kernel oops.
 
+Severity   : normal
+Bugzilla   : 17026
+Description: (ptllnd_peer.c:557:kptllnd_peer_check_sends()) ASSERTION(!in_interrupt()) failed
+Details    : fix stack overflow in the distributed lock manager by defering export
+            eviction after a failed ast to the elt thread instead of handling
+            it in the dlm interpret routine.
+
 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index f2965fc..948abea 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -486,7 +486,14 @@ static void ldlm_failed_ast(struct ldlm_lock *lock, int rc,
 
         if (obd_dump_on_timeout)
                 libcfs_debug_dumplog();
+#ifdef __KERNEL__
+        spin_lock_bh(&waiting_locks_spinlock);
+        list_add(&lock->l_pending_chain, &expired_lock_thread.elt_expired_locks);
+        cfs_waitq_signal(&expired_lock_thread.elt_waitq);
+        spin_unlock_bh(&waiting_locks_spinlock);
+#else
         class_fail_export(lock->l_export);
+#endif
 }
 
 static int ldlm_handle_ast_error(struct ldlm_lock *lock,