Commit 3ea0056b authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds

[PATCH] rmmod ohci1394 hangs

this sequence of commands will hang the final rmmod.

	init=/bin/bash --login
	mount proc
	modprove -v ohci1394
	rmmod ohci1394
	modprobe -v ohci1394
	rmmod ohci1394  ->  hangs

knodemgrd_0 exits on the first rmmod, but leaves nodemgr_serialize in down
state.

This fixes it for me.
Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Acked-by: default avatarBen Collins <bcollins@debian.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ea8d2319
...@@ -1488,8 +1488,10 @@ static int nodemgr_host_thread(void *__hi) ...@@ -1488,8 +1488,10 @@ static int nodemgr_host_thread(void *__hi)
break; break;
} }
if (hi->kill_me) if (hi->kill_me) {
up(&nodemgr_serialize);
break; break;
}
/* Pause for 1/4 second in 1/16 second intervals, /* Pause for 1/4 second in 1/16 second intervals,
* to make sure things settle down. */ * to make sure things settle down. */
...@@ -1513,8 +1515,10 @@ static int nodemgr_host_thread(void *__hi) ...@@ -1513,8 +1515,10 @@ static int nodemgr_host_thread(void *__hi)
i = 0; i = 0;
/* Check the kill_me again */ /* Check the kill_me again */
if (hi->kill_me) if (hi->kill_me) {
up(&nodemgr_serialize);
goto caught_signal; goto caught_signal;
}
} }
if (!nodemgr_check_irm_capability(host, reset_cycles)) { if (!nodemgr_check_irm_capability(host, reset_cycles)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment