summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Bertschinger <tahbertschinger@gmail.com>2024-02-20 20:24:20 -0700
committerKent Overstreet <kent.overstreet@linux.dev>2024-02-20 22:27:19 -0500
commit25e84a9917fc8c2f1c7d2976e946c5e5a22b3589 (patch)
tree8a649d705fe1988f3d68ba5c9e0c17874e024afb /src
parentde9c798382da3ccb1cb5f0427bb5912d01ab66be (diff)
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 <tahbertschinger@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'src')
-rw-r--r--src/wrappers/handle.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wrappers/handle.rs b/src/wrappers/handle.rs
index 48148a8f..60bdedb7 100644
--- a/src/wrappers/handle.rs
+++ b/src/wrappers/handle.rs
@@ -22,7 +22,7 @@ impl BcachefsHandle {
/// I/O control commands that can be sent to a bcachefs filesystem
/// Those are non-exhaustive
-#[repr(u64)]
+#[repr(u32)]
#[non_exhaustive]
pub enum BcachefsIoctl {
SubvolumeCreate = BCH_IOCTL_SUBVOLUME_CREATE,
@@ -47,7 +47,7 @@ impl BcachefsHandle {
/// Type-safe [`libc::ioctl`] for bcachefs filesystems
pub fn ioctl(&self, request: BcachefsIoctl, payload: &BcachefsIoctlPayload) -> Result<(), Errno> {
let payload_ptr: *const libc::c_void = payload.into();
- let ret = unsafe { libc::ioctl(self.inner.ioctl_fd, request as u64, payload_ptr) };
+ let ret = unsafe { libc::ioctl(self.inner.ioctl_fd, request as libc::Ioctl, payload_ptr) };
if ret == -1 {
Err(errno::errno())