From: Yang Kun <91833768+ikspress@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:15:16 +0000 (+0800)
Subject: libblkid: improve portability
X-Git-Tag: v2.42-start~230
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dd59417e81967036037d430cc56b3e64d45f5a3;p=thirdparty%2Futil-linux.git

libblkid: improve portability
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 5e7aceb59..5a17e873d 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -972,10 +972,19 @@ failed:
 
 #endif
 
-#ifdef BLKIOOPT
 static uint64_t blkid_get_io_size(int fd)
 {
-	static const int ioctls[] = { BLKIOOPT, BLKIOMIN, BLKBSZGET };
+	static const int ioctls[] = {
+#ifdef BLKIOOPT
+		BLKIOOPT,
+#endif
+#ifdef BLKIOMIN
+		BLKIOMIN,
+#endif
+#ifdef BLKBSZGET
+		BLKBSZGET,
+#endif
+	};
 	unsigned int s;
 	size_t i;
 	int r;
@@ -988,7 +997,6 @@ static uint64_t blkid_get_io_size(int fd)
 
 	return DEFAULT_SECTOR_SIZE;
 }
-#endif
 
 /**
  * blkid_probe_set_device:
@@ -1197,10 +1205,8 @@ 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));