diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-10-01 14:56:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-01 14:56:46 +0000 |
commit | 76f04df295c47ad5c9b74f67a37854b2a66137c9 (patch) | |
tree | f3acd5c38f2a31a8882f33d23f77a296a4c87658 | |
parent | a40d49b82b7c44eafaef02488c1a89f9a7644001 (diff) | |
parent | 55022bb67a13829263455f5ff68da52b23b643fe (diff) | |
download | nix-76f04df295c47ad5c9b74f67a37854b2a66137c9.zip |
Merge #1829
1829: statfs: add namespace fs magic r=rtzoeller a=tammela
Namespace filesystem magic is missing from FsType constants.
Co-authored-by: Pedro Tammela <pctammela@gmail.com>
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | src/sys/statfs.rs | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e191a6..e0c2e3b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). ## [Unreleased] - ReleaseDate ### Added +- Added `NSFS_MAGIC` FsType on Linux and Android. + ([#1829](https://github.com/nix-rust/nix/pull/1829)) - Added `sched_getcpu` on platforms that support it. ([#1825](https://github.com/nix-rust/nix/pull/1825)) - Added `sched_getaffinity` and `sched_setaffinity` on FreeBSD. @@ -27,7 +27,7 @@ targets = [ ] [dependencies] -libc = { version = "0.2.133", features = [ "extra_traits" ] } +libc = { version = "0.2.134", features = [ "extra_traits" ] } bitflags = "1.1" cfg-if = "1.0" pin-utils = { version = "0.1.0", optional = true } diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs index e8c06e4e..8d2b283b 100644 --- a/src/sys/statfs.rs +++ b/src/sys/statfs.rs @@ -205,6 +205,9 @@ pub const USBDEVICE_SUPER_MAGIC: FsType = FsType(libc::USBDEVICE_SUPER_MAGIC as #[cfg(any(target_os = "linux", target_os = "android"))] #[allow(missing_docs)] pub const XENFS_SUPER_MAGIC: FsType = FsType(libc::XENFS_SUPER_MAGIC as fs_type_t); +#[cfg(any(target_os = "linux", target_os = "android"))] +#[allow(missing_docs)] +pub const NSFS_MAGIC: FsType = FsType(libc::NSFS_MAGIC as fs_type_t); impl Statfs { |