Skip to contentSkip to conversation

ieee1394 nodemgr deadlock

PATCH New Stelian Pop 1 participant 1 message Oct 26, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ieee1394 nodemgr deadlock

Hi,

This patch was submitted here a while ago, has been ack'ed by Ben Collins but it still hasn't made it into the 2.4 tree.

Marcelo, please apply it, without this patch kudzu deadlocks on every boot on my RedHat laptop.

Thanks,

Stelian.

===== drivers/ieee1394/nodemgr.c 1.23 vs edited =====

drivers/ieee1394/nodemgr.c +3 -1
@@ -1317,8 +1317,10 @@
 		 * to make sure things settle down. */
 		for (i = 0; i < 4 ; i++) {
 			set_current_state(TASK_INTERRUPTIBLE);
-			if (schedule_timeout(HZ/16))
+			if (schedule_timeout(HZ/16)) {
+				up(&nodemgr_serialize);
 				goto caught_signal;
+			}
 
 			/* Now get the generation in which the node ID's we collect
 			 * are valid.  During the bus scan we will use this generation
Signature · 1 line
Stelian Pop <[email protected]>