From a3ab71cfd3f2b2240e05df3e9cc0800ab4578744 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 10 Nov 2011 20:18:54 +0100 Subject: [PATCH] libblkid: don't call CDROM_GET_CAPABILITY for partitions Reported-by: Jeff Moyer Signed-off-by: Karel Zak --- libblkid/src/probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.47.3