diff -urpN multipath-tools/libmultipath/discovery.c multipath-tools-patched/libmultipath/discovery.c
--- multipath-tools/libmultipath/discovery.c	2008-02-12 14:00:38.000000000 -0600
+++ multipath-tools-patched/libmultipath/discovery.c	2008-02-15 09:28:32.000000000 -0600
@@ -170,11 +170,6 @@ path_discovery (vector pathvec, struct c
 	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 @@ wait_for_file (char * filename)
 	}
 	return 1;
 }
-#else
-static int
-wait_for_file (char * filename)
-{
-	return 0;
-}
-#endif
 
 #define declare_sysfs_get_str(fname, fmt) \
 extern int \