[Linux1394-cvslog] rev 802 - trunk

[SVN U. <ben...@li...>]

Author: bencollins
Date: 2003-02-26 16:20:59 -0500 (Wed, 26 Feb 2003)
New Revision: 802

Modified:
   trunk/nodemgr.c
Log:
Re-arrange knodemgrd logic a bit better.


Modified: trunk/nodemgr.c
==============================================================================
--- trunk/nodemgr.c	(original)
+++ trunk/nodemgr.c	2003-02-26 16:21:00.000000000 -0500
@@ -1269,10 +1269,14 @@
 	while (!down_interruptible(&hi->reset_sem) &&
 	       !down_interruptible(&nodemgr_serialize)) {
 
-		nodemgr_node_probe(hi->host);
+		if (!nodemgr_check_root_capability(hi->host)) {
+			/* Do nothing, we are resetting */
+			up(&nodemgr_serialize);
+			continue;
+		}
 
-		if (nodemgr_check_root_capability(hi->host))
-			nodemgr_do_irm_duties(hi->host);
+		nodemgr_node_probe(hi->host);
+		nodemgr_do_irm_duties(hi->host);
 
 		up(&nodemgr_serialize);
 	}