From c20fab79b0afab280dcdb557abf3fb28b800f29d Mon Sep 17 00:00:00 2001 From: Pedro Tammela Date: Mon, 26 Sep 2022 16:27:11 +0200 Subject: [PATCH 1/2] statfs: add namespace fs magic Namespace filesystem magic is missing from FsType constants. --- CHANGELOG.md | 2 ++ src/sys/statfs.rs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e191a62f..e0c2e3b88f 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. diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs index e8c06e4e3f..8d2b283beb 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 { From 55022bb67a13829263455f5ff68da52b23b643fe Mon Sep 17 00:00:00 2001 From: Pedro Tammela Date: Fri, 30 Sep 2022 11:07:55 -0300 Subject: [PATCH 2/2] libc: bump libc to 0.2.134 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 240a3f0b7a..290ba8e330 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 }