From 84f44ec07f73e40fc505e5f8fa492d9faec300ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Matu=C5=A1ka?= Date: Mon, 7 Oct 2024 19:31:46 +0200 Subject: [PATCH] Return boolean_t in inline functions of lib/libspl/include/sys/uio.h The inline functions zfs_dio_offset_aligned(), zfs_dio_size_aligned() and zfs_dio_aligned() are declared as boolean_t but return the bool type. This fixes the build of FreeBSD. Reviewed-by: Alexander Motin Reviewed-by: Brian Behlendorf Signed-off-by: Martin Matuska Closes #16613 --- lib/libspl/include/sys/uio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libspl/include/sys/uio.h b/lib/libspl/include/sys/uio.h index 2cb0107d5..16749fa49 100644 --- a/lib/libspl/include/sys/uio.h +++ b/lib/libspl/include/sys/uio.h @@ -92,20 +92,20 @@ zfs_dio_page_aligned(void *buf) static inline boolean_t zfs_dio_offset_aligned(uint64_t offset, uint64_t blksz) { - return (IS_P2ALIGNED(offset, blksz)); + return ((IS_P2ALIGNED(offset, blksz)) ? B_TRUE : B_FALSE); } static inline boolean_t zfs_dio_size_aligned(uint64_t size, uint64_t blksz) { - return ((size % blksz) == 0); + return (((size % blksz) == 0) ? B_TRUE : B_FALSE); } static inline boolean_t zfs_dio_aligned(uint64_t offset, uint64_t size, uint64_t blksz) { - return (zfs_dio_offset_aligned(offset, blksz) && - zfs_dio_size_aligned(size, blksz)); + return ((zfs_dio_offset_aligned(offset, blksz) && + zfs_dio_size_aligned(size, blksz)) ? B_TRUE : B_FALSE); } static inline void