Skip to content

Commit c3731f1

Browse files
bors[bot]rtzoeller
andauthored
Merge #1634
1634: Define UMOUNT_NOFOLLOW, FUSE_SUPER_MAGIC r=rtzoeller a=rtzoeller Resolves #1631 and resolves #1633. Co-authored-by: Ryan Zoeller <[email protected]>
2 parents 18d1f62 + 6503921 commit c3731f1

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
3131
(#[1622](https://github.com/nix-rust/nix/pull/1622))
3232
- Added `sendfile` on DragonFly.
3333
(#[1615](https://github.com/nix-rust/nix/pull/1615))
34+
- Added `UMOUNT_NOFOLLOW`, `FUSE_SUPER_MAGIC` on Linux.
35+
(#[1634](https://github.com/nix-rust/nix/pull/1634))
3436
- Added `getresuid`, `setresuid`, `getresgid`, and `setresgid` on DragonFly, FreeBSD, and OpenBSD.
3537
(#[1628](https://github.com/nix-rust/nix/pull/1628))
3638

src/mount/linux.rs

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ libc_bitflags!(
5353
MNT_FORCE;
5454
MNT_DETACH;
5555
MNT_EXPIRE;
56+
UMOUNT_NOFOLLOW;
5657
}
5758
);
5859

src/sys/statfs.rs

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ pub const EXT3_SUPER_MAGIC: FsType = FsType(libc::EXT3_SUPER_MAGIC as fs_type_t)
7373
pub const EXT4_SUPER_MAGIC: FsType = FsType(libc::EXT4_SUPER_MAGIC as fs_type_t);
7474
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
7575
#[allow(missing_docs)]
76+
pub const FUSE_SUPER_MAGIC: FsType = FsType(libc::FUSE_SUPER_MAGIC as fs_type_t);
77+
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
78+
#[allow(missing_docs)]
7679
pub const HPFS_SUPER_MAGIC: FsType = FsType(libc::HPFS_SUPER_MAGIC as fs_type_t);
7780
#[cfg(all(target_os = "linux", not(target_env = "musl")))]
7881
#[allow(missing_docs)]

0 commit comments

Comments
 (0)