fix: make FUSE_ROOT_ID an u64

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
rust-osdev · Jul 12, 2024 · 985de0e · 985de0e
1 parent 2cee5d4
commit 985de0e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/bindgen.sh b/bindgen.sh
@@ -18,4 +18,4 @@ gen() {
 
 gen include/linux.h -o src/linux.rs
 gen include/macos.h -o src/macos.rs -- -D __APPLE__
-git apply 0001-fix-add-zerocopy-support-for-__IncompleteArrayField.patch
+git apply patches/*
diff --git a/...-support-for-__IncompleteArrayField.patch → ...-support-for-__IncompleteArrayField.patch b/...-support-for-__IncompleteArrayField.patch → ...-support-for-__IncompleteArrayField.patch
diff --git a/patches/0002-fix-make-FUSE_ROOT_ID-an-u64.patch b/patches/0002-fix-make-FUSE_ROOT_ID-an-u64.patch
@@ -0,0 +1,24 @@
+diff --git a/src/linux.rs b/src/linux.rs
+--- a/src/linux.rs
++++ b/src/linux.rs
+@@ -40,7 +40,7 @@ impl<T> ::core::fmt::Debug for __IncompleteArrayField<T> {
+ }
+ pub const FUSE_KERNEL_VERSION: u32 = 7;
+ pub const FUSE_KERNEL_MINOR_VERSION: u32 = 40;
+-pub const FUSE_ROOT_ID: u32 = 1;
++pub const FUSE_ROOT_ID: u64 = 1;
+ pub const FATTR_MODE: u32 = 1;
+ pub const FATTR_UID: u32 = 2;
+ pub const FATTR_GID: u32 = 4;
+diff --git a/src/macos.rs b/src/macos.rs
+--- a/src/macos.rs
++++ b/src/macos.rs
+@@ -40,7 +40,7 @@ impl<T> ::core::fmt::Debug for __IncompleteArrayField<T> {
+ }
+ pub const FUSE_KERNEL_VERSION: u32 = 7;
+ pub const FUSE_KERNEL_MINOR_VERSION: u32 = 19;
+-pub const FUSE_ROOT_ID: u32 = 1;
++pub const FUSE_ROOT_ID: u64 = 1;
+ pub const FATTR_MODE: u32 = 1;
+ pub const FATTR_UID: u32 = 2;
+ pub const FATTR_GID: u32 = 4;
diff --git a/src/linux.rs b/src/linux.rs
@@ -40,7 +40,7 @@ impl<T> ::core::fmt::Debug for __IncompleteArrayField<T> {
 }
 pub const FUSE_KERNEL_VERSION: u32 = 7;
 pub const FUSE_KERNEL_MINOR_VERSION: u32 = 40;
-pub const FUSE_ROOT_ID: u32 = 1;
+pub const FUSE_ROOT_ID: u64 = 1;
 pub const FATTR_MODE: u32 = 1;
 pub const FATTR_UID: u32 = 2;
 pub const FATTR_GID: u32 = 4;

diff --git a/src/macos.rs b/src/macos.rs
@@ -40,7 +40,7 @@ impl<T> ::core::fmt::Debug for __IncompleteArrayField<T> {
 }
 pub const FUSE_KERNEL_VERSION: u32 = 7;
 pub const FUSE_KERNEL_MINOR_VERSION: u32 = 19;
-pub const FUSE_ROOT_ID: u32 = 1;
+pub const FUSE_ROOT_ID: u64 = 1;
 pub const FATTR_MODE: u32 = 1;
 pub const FATTR_UID: u32 = 2;
 pub const FATTR_GID: u32 = 4;