Re: [ANNOUNCE] util-linux v2.39.3

[Samuel Thibault]

Hello,

Karel Zak, le lun. 04 déc. 2023 21:05:08 +0100, a ecrit:
> The util-linux stable release v2.39.3 is available at
>  
>   http://www.kernel.org/pub/linux/utils/util-linux/v2.39/

Here a fix for non-Linux builds.

Samuel

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 19b80ec6e..8b9bbc24d 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));