diff mbox

[v10,3/7] block: Prevent detection of /dev/fdset/ as floppy

Message ID 1344866929-30456-4-git-send-email-coreyb@linux.vnet.ibm.com
State New
Headers show

Commit Message

Corey Bryant Aug. 13, 2012, 2:08 p.m. UTC 
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
---
v8
 -This patch is new in v8. It was reported on a prior fd passing
  approach and I realized it's needed in this series.
  (kwolf@redhat.com)

v9-v10
 -No changes

 block/raw-posix.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

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 @@  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) {