From: Karel Zak <kzak@redhat.com>
Date: Thu, 10 Nov 2011 19:18:54 +0000 (+0100)
Subject: libblkid: don't call CDROM_GET_CAPABILITY for partitions
X-Git-Tag: v2.21-rc1~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3ab71cfd3f2b2240e05df3e9cc0800ab4578744;p=thirdparty%2Futil-linux.git

libblkid: don't call CDROM_GET_CAPABILITY for partitions

Reported-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 2902de9bd0..e801c7afdf 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -707,7 +707,10 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 		pr->flags |= BLKID_FL_TINY_DEV;
 
 #ifdef CDROM_GET_CAPABILITY
-	if (S_ISBLK(sb.st_mode) && ioctl(fd, CDROM_GET_CAPABILITY, NULL) >= 0)
+	if (S_ISBLK(sb.st_mode) &&
+	    !blkid_probe_is_tiny(pr) &&
+	    blkid_probe_is_wholedisk(pr) &&
+	    ioctl(fd, CDROM_GET_CAPABILITY, NULL) >= 0)
 		pr->flags |= BLKID_FL_CDROM_DEV;
 #endif