Patchwork [STABLE,0.13,07/13] raw-posix: Don't use file name for host_cdrom detection on Linux

login
register
mail settings
Submitter Kevin Wolf
Date Sept. 13, 2010, 12:42 p.m.
Message ID <1284381771-7333-8-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/64588/
State New
Headers show

Comments

Kevin Wolf - Sept. 13, 2010, 12:42 p.m.
On Linux, we have code to detect CD-ROMs using an ioctl. We shouldn't lose
anything but false positives by removing the check for a /dev/cd* path.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 897804d6299af372a43110799cbe1d6804d5e1bc)
---
 block/raw-posix.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Patch

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 72fb8ce..0fce449 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1154,9 +1154,6 @@  static int cdrom_probe_device(const char *filename)
     int fd, ret;
     int prio = 0;
 
-    if (strstart(filename, "/dev/cd", NULL))
-        prio = 50;
-
     fd = open(filename, O_RDONLY | O_NONBLOCK);
     if (fd < 0) {
         goto out;