hal/hald/linux/volume_id volume_id.c,1.8,1.9

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/volume_id
In directory pdx:/tmp/cvs-serv32047/hald/linux/volume_id

Modified Files:
	volume_id.c 
Log Message:
2004-07-05  David Zeuthen  <david at fubar.dk>

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Comment
	out get_buffer, it's quite time consuming on floppies and Kay
	says OK. Move probe_vfat() and probe_msdos() to the top.



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- volume_id.c	5 Jul 2004 19:27:25 -0000	1.8
+++ volume_id.c	5 Jul 2004 19:57:22 -0000	1.9
@@ -1133,7 +1133,13 @@
 	case ALL:
 	default:
 		/* fill buffer with maximum */
-		get_buffer(id, 0, SB_BUFFER_SIZE);
+		/*get_buffer(id, 0, SB_BUFFER_SIZE);*/
+		rc = probe_vfat(id);
+		if (rc == 0)
+			break;
+		rc = probe_msdos(id);
+		if (rc == 0)
+			break;
 		rc = probe_swap(id);
 		if (rc == 0)
 			break;
@@ -1149,12 +1155,6 @@
 		rc = probe_jfs(id);
 		if (rc == 0)
 			break;
-		rc = probe_msdos(id);
-		if (rc == 0)
-			break;
-		rc = probe_vfat(id);
-		if (rc == 0)
-			break;
 		rc = probe_udf(id);
 		if (rc == 0)
 			break;