From 9f2dae548b97ded6348cfab8f4545d94f3b6b096 Mon Sep 17 00:00:00 2001 From: bobijam Date: Fri, 6 Mar 2009 05:40:40 +0000 Subject: [PATCH] Branch b1_8 b=18154 i=alexey.lyashkov (shadow) i=johann 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 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index f5c617f..2c18c1d 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -1207,7 +1207,6 @@ static int signal_completed_replay(struct obd_import *imp) static int ptlrpc_invalidate_import_thread(void *data) { struct obd_import *imp = data; - int disconnect; ENTRY; @@ -1219,13 +1218,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(); @@ -1234,7 +1226,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