block: Prevent detection of /dev/fdset/ as floppy
authorCorey Bryant <coreyb@linux.vnet.ibm.com>
Tue, 14 Aug 2012 20:43:44 +0000 (16:43 -0400)
committerKevin Wolf <kwolf@redhat.com>
Wed, 15 Aug 2012 08:48:57 +0000 (10:48 +0200)
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/raw-posix.c

index 0dce089..f606211 100644 (file)
@@ -1052,8 +1052,10 @@ static int floppy_probe_device(const char *filename)
     struct floppy_struct fdparam;
     struct stat st;
 
-    if (strstart(filename, "/dev/fd", NULL))
+    if (strstart(filename, "/dev/fd", NULL) &&
+        !strstart(filename, "/dev/fdset/", NULL)) {
         prio = 50;
+    }
 
     fd = open(filename, O_RDONLY | O_NONBLOCK);
     if (fd < 0) {