commit e17408283562be359f16a7e12ddfee7509d6fe11
author Corey Bryant <coreyb@linux.vnet.ibm.com> Tue Aug 14 16:43:44 2012 -0400
committer Kevin Wolf <kwolf@redhat.com> Wed Aug 15 10:48:57 2012 +0200
tree 9f8d0f5755a6946aad67b53cc631501eefa03ab0
parent ba1c048a8f9c4a62812a8735ebd4fde0cfd086e8

block: Prevent detection of /dev/fdset/ as floppy

Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block/raw-posix.c

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 0dce089..f606211 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1052,8 +1052,10 @@
     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) {