From 1d02edc12a4ea80f8274643eb56987ccb45f8855 Mon Sep 17 00:00:00 2001 From: johann Date: Thu, 5 Mar 2009 21:34:31 +0000 Subject: [PATCH] Branch b_release_1_8_0 b=18154 i=shadow i=johann (original patch from bobijam) always calls ptlrpc_import_recovery_state_machine() in invalidate_import_thread() because otherwise threads sleeping on the import's imp_recovery_waitq could be never woken up. --- lustre/ptlrpc/import.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index bac165b..c208ef9 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -1193,13 +1193,6 @@ static int ptlrpc_invalidate_import_thread(void *data) ptlrpc_invalidate_import(imp); - /* is client_disconnect_export in flight ? */ - spin_lock(&imp->imp_lock); - disconnect = imp->imp_deactive; - spin_unlock(&imp->imp_lock); - if (disconnect) - GOTO(out, 0 ); - if (obd_dump_on_eviction) { CERROR("dump the log upon eviction\n"); libcfs_debug_dumplog(); @@ -1208,7 +1201,6 @@ static int ptlrpc_invalidate_import_thread(void *data) IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER); ptlrpc_import_recovery_state_machine(imp); -out: class_import_put(imp); RETURN(0); } -- 1.8.3.1