From: Samuel Thibault <samuel.thibault@aquilenet.fr>
Date: Tue, 5 Dec 2023 10:13:04 +0000 (+0100)
Subject: libblkid: improve portability
X-Git-Tag: v2.40-rc1~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=224f299896db3021e4761e5f8abf9f2ec1d74c47;p=thirdparty%2Futil-linux.git

libblkid: improve portability

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index da1cc75490..27085b473d 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -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));