Skip to content

Commit 76f04df

Browse files
bors[bot]tammela
andauthored
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>
2 parents a40d49b + 55022bb commit 76f04df

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
66
## [Unreleased] - ReleaseDate
77
### Added
88

9+
- Added `NSFS_MAGIC` FsType on Linux and Android.
10+
([#1829](https://github.com/nix-rust/nix/pull/1829))
911
- Added `sched_getcpu` on platforms that support it.
1012
([#1825](https://github.com/nix-rust/nix/pull/1825))
1113
- Added `sched_getaffinity` and `sched_setaffinity` on FreeBSD.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ targets = [
2727
]
2828

2929
[dependencies]
30-
libc = { version = "0.2.133", features = [ "extra_traits" ] }
30+
libc = { version = "0.2.134", features = [ "extra_traits" ] }
3131
bitflags = "1.1"
3232
cfg-if = "1.0"
3333
pin-utils = { version = "0.1.0", optional = true }

src/sys/statfs.rs

+3
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ pub const USBDEVICE_SUPER_MAGIC: FsType = FsType(libc::USBDEVICE_SUPER_MAGIC as
205205
#[cfg(any(target_os = "linux", target_os = "android"))]
206206
#[allow(missing_docs)]
207207
pub const XENFS_SUPER_MAGIC: FsType = FsType(libc::XENFS_SUPER_MAGIC as fs_type_t);
208+
#[cfg(any(target_os = "linux", target_os = "android"))]
209+
#[allow(missing_docs)]
210+
pub const NSFS_MAGIC: FsType = FsType(libc::NSFS_MAGIC as fs_type_t);
208211

209212

210213
impl Statfs {

0 commit comments

Comments
 (0)