[dm-devel] multipath-tools/libmultipath discovery.c

[bmarzins sourceware org]

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL4_FC5
Changes by:	bmarzins sourceware org	2008-03-05 20:53:16

Modified files:
	libmultipath   : discovery.c 

Log message:
	multipath wasn't waiting for the devices to get initialized.  This was causing
	it to fail during boot.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/discovery.c.diff?cvsroot=dm&only_with_tag=RHEL4_FC5&r1=1.28.2.5&r2=1.28.2.6

--- multipath-tools/libmultipath/discovery.c	2008/01/25 22:30:00	1.28.2.5
+++ multipath-tools/libmultipath/discovery.c	2008/03/05 20:53:14	1.28.2.6
@@ -170,11 +170,6 @@
 	return r;
 }
 
-/*
- * the daemon can race udev upon path add,
- * not multipath(8), ran by udev
- */
-#if DAEMON
 #define WAIT_MAX_SECONDS 5
 #define WAIT_LOOP_PER_SECOND 5
 
@@ -197,13 +192,6 @@
 	}
 	return 1;
 }
-#else
-static int
-wait_for_file (char * filename)
-{
-	return 0;
-}
-#endif
 
 #define declare_sysfs_get_str(fname, fmt) \
 extern int \