summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Zoeller <rtzoeller@rtzoeller.com>2022-01-14 08:04:52 -0600
committerRyan Zoeller <rtzoeller@rtzoeller.com>2022-01-18 16:52:23 -0600
commit65039212d1b1dce51c250ad552a92a7a077c54a8 (patch)
tree8ff0b1f1b3a0bedb7ffeb1e6263dcf79ea2b62fb
parent18d1f62b150177ca4c40e2cbe21a98ddba80ecf7 (diff)
downloadnix-65039212d1b1dce51c250ad552a92a7a077c54a8.zip
Define UMOUNT_NOFOLLOW, FUSE_SUPER_MAGIC on Linux
Requested-by: jiangliu
-rw-r--r--CHANGELOG.md2
-rw-r--r--src/mount/linux.rs1
-rw-r--r--src/sys/statfs.rs3
3 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fc82de..5d84e7eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
(#[1622](https://github.com/nix-rust/nix/pull/1622))
- Added `sendfile` on DragonFly.
(#[1615](https://github.com/nix-rust/nix/pull/1615))
+- Added `UMOUNT_NOFOLLOW`, `FUSE_SUPER_MAGIC` on Linux.
+ (#[1634](https://github.com/nix-rust/nix/pull/1634))
- Added `getresuid`, `setresuid`, `getresgid`, and `setresgid` on DragonFly, FreeBSD, and OpenBSD.
(#[1628](https://github.com/nix-rust/nix/pull/1628))
diff --git a/src/mount/linux.rs b/src/mount/linux.rs
index 4cb2fa54..4c976dcb 100644
--- a/src/mount/linux.rs
+++ b/src/mount/linux.rs
@@ -53,6 +53,7 @@ libc_bitflags!(
MNT_FORCE;
MNT_DETACH;
MNT_EXPIRE;
+ UMOUNT_NOFOLLOW;
}
);
diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs
index 62273475..e46733e7 100644
--- a/src/sys/statfs.rs
+++ b/src/sys/statfs.rs
@@ -73,6 +73,9 @@ pub const EXT3_SUPER_MAGIC: FsType = FsType(libc::EXT3_SUPER_MAGIC as fs_type_t)
pub const EXT4_SUPER_MAGIC: FsType = FsType(libc::EXT4_SUPER_MAGIC as fs_type_t);
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
#[allow(missing_docs)]
+pub const FUSE_SUPER_MAGIC: FsType = FsType(libc::FUSE_SUPER_MAGIC as fs_type_t);
+#[cfg(all(target_os = "linux", not(target_env = "musl")))]
+#[allow(missing_docs)]
pub const HPFS_SUPER_MAGIC: FsType = FsType(libc::HPFS_SUPER_MAGIC as fs_type_t);
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
#[allow(missing_docs)]