hal/hald/linux/volume_id volume_id.c,1.42,1.43

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/volume_id
In directory gabe:/tmp/cvs-serv12391/hald/linux/volume_id

Modified Files:
	volume_id.c 
Log Message:
2004-10-15  David Zeuthen  <davidz at redhat.com>

	* hald/linux/block_class_device.c (detect_media): Fixup reuse
	of file descriptors since we want O_NONBLOCK for polling and we
	don't want to reuse that for probing the media (see below(
	
	* hald/linux/volume_id/volume_id.c (volume_id_open_node): Never
	use O_NONBLOCK since new kernel semantics can and will return
	EAGAIN aka EWOULDBLOCK (see RH bug 135886).



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- volume_id.c	29 Sep 2004 16:29:45 -0000	1.42
+++ volume_id.c	15 Oct 2004 20:39:51 -0000	1.43
@@ -2128,7 +2128,7 @@
 	struct volume_id *id;
 	int fd;
 
-	fd = open(path, O_RDONLY | O_NONBLOCK);
+	fd = open(path, O_RDONLY /*| O_NONBLOCK */);
 	if (fd < 0) {
 		dbg("unable to open '%s'", path);
 		return NULL;