]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: improve portability
authorSamuel Thibault <samuel.thibault@aquilenet.fr>
Tue, 5 Dec 2023 10:13:04 +0000 (11:13 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 5 Dec 2023 10:13:04 +0000 (11:13 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
libblkid/src/probe.c

index da1cc75490dd7954bc2a1d017e3612b444d5aab3..27085b473d03caeb0c33f56359e17d159d9238a7 100644 (file)
@@ -962,6 +962,7 @@ failed:
 
 #endif
 
+#ifdef BLKIOOPT
 static uint64_t blkid_get_io_size(int fd)
 {
        static const int ioctls[] = { BLKIOOPT, BLKIOMIN, BLKBSZGET };
@@ -977,6 +978,7 @@ static uint64_t blkid_get_io_size(int fd)
 
        return DEFAULT_SECTOR_SIZE;
 }
+#endif
 
 /**
  * blkid_probe_set_device:
@@ -1185,8 +1187,10 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
        }
 # endif
 
+#ifdef BLKIOOPT
        if (S_ISBLK(sb.st_mode) && !is_floppy && !blkid_probe_is_tiny(pr))
                pr->io_size = blkid_get_io_size(fd);
+#endif
 
        DBG(LOWPROBE, ul_debug("ready for low-probing, offset=%"PRIu64", size=%"PRIu64", zonesize=%"PRIu64", iosize=%"PRIu64,
                                pr->off, pr->size, pr->zone_size, pr->io_size));