diff options
| author | bors <bors@rust-lang.org> | 2022-01-12 17:07:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-12 17:07:42 +0000 |
| commit | 26b68f834c4a629aac695147006e22c7515da884 (patch) | |
| tree | 6ab556aa8285db743b38bc3b1e1c41a6121a44cf | |
| parent | c1ffba4263a0cf1039915109e49e1e47854114f0 (diff) | |
| parent | fc9854f0d3ec25f78b91bd587b47ef95c95ef39a (diff) | |
| download | rust-libc-26b68f834c4a629aac695147006e22c7515da884.tar.gz | |
Auto merge of #2622 - devnexen:fuse_super_magic, r=Amanieu
linux GLIBC add FUSE_SUPER_MAGIC
close #2621
| -rw-r--r-- | libc-test/build.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/mod.rs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index fb008faeae..d9965d39f8 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -3182,6 +3182,9 @@ fn test_linux(target: &str) { // headers conflicts with linux/pidfd.h "PIDFD_NONBLOCK" => true, + // is a private value for kernel usage normally + "FUSE_SUPER_MAGIC" => true, + _ => false, } }); diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index da7e9e4e9f..a0dfb47226 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -867,6 +867,7 @@ cfg_if! { pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53; pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53; pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010; + pub const FUSE_SUPER_MAGIC: ::c_long = 0x65735546; pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea; pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee; pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849; @@ -921,6 +922,7 @@ cfg_if! { pub const EXT3_SUPER_MAGIC: ::c_uint = 0x0000ef53; pub const EXT4_SUPER_MAGIC: ::c_uint = 0x0000ef53; pub const F2FS_SUPER_MAGIC: ::c_uint = 0xf2f52010; + pub const FUSE_SUPER_MAGIC: ::c_uint = 0x65735546; pub const FUTEXFS_SUPER_MAGIC: ::c_uint = 0xbad1dea; pub const HOSTFS_SUPER_MAGIC: ::c_uint = 0x00c0ffee; pub const HPFS_SUPER_MAGIC: ::c_uint = 0xf995e849; |