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 2902de9bd086e5ae3c4fcc5ff2303359d303a6df..e801c7afdf4739950acabba18f420e1fbebcfd4c 100644 (file)
--- 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