From 25e84a9917fc8c2f1c7d2976e946c5e5a22b3589 Mon Sep 17 00:00:00 2001 From: Thomas Bertschinger Date: Tue, 20 Feb 2024 20:24:20 -0700 Subject: rust: use libc::Ioctl type for ioctl() request argument The second argument to ioctl() can be defined as a different type by different libc implementations, and can be a different size on different architectures depending on what type it is defined as. For example, glibc defines it as `unsigned long` which may have a different size on 32-bit vs. 64-bit architectures, and musl libc defines it as `int`. The Rust libc crate exposes a type `libc::Ioctl` which is defined as the appropriate integer type for the given libc implementation. Using this type for the request argument to `libc::ioctl()` ensures code will compile correctly regardless of architecture and libc implementation. Also, because ioctl request numbers are defined to be 32 bits (regardless of the fact that `unsigned long` might sometimes take 64 bits on some architectures), this patch changes the Rust representation of the bcachefs ioctl numbers to u32 instead of u64. Signed-off-by: Thomas Bertschinger Signed-off-by: Kent Overstreet --- bch_bindgen/src/libbcachefs_wrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bch_bindgen/src/libbcachefs_wrapper.h') diff --git a/bch_bindgen/src/libbcachefs_wrapper.h b/bch_bindgen/src/libbcachefs_wrapper.h index bc4658fb..128592c3 100644 --- a/bch_bindgen/src/libbcachefs_wrapper.h +++ b/bch_bindgen/src/libbcachefs_wrapper.h @@ -33,5 +33,5 @@ MARK_FIX_753(blk_mode_t, BLK_OPEN_READ); MARK_FIX_753(blk_mode_t, BLK_OPEN_WRITE); MARK_FIX_753(blk_mode_t, BLK_OPEN_EXCL); -MARK_FIX_753(__u64, BCH_IOCTL_SUBVOLUME_CREATE); -MARK_FIX_753(__u64, BCH_IOCTL_SUBVOLUME_DESTROY); +MARK_FIX_753(__u32, BCH_IOCTL_SUBVOLUME_CREATE); +MARK_FIX_753(__u32, BCH_IOCTL_SUBVOLUME_DESTROY); -- cgit v1.2.3