Auto merge of #2928 - tammela:patch-1, r=JohnTitor

bors · bors · commit 183820f6330d · 2022-09-27T22:58:36.000Z
fs: add NSFS_MAGIC constant

NSFS_MAGIC defines the filesystem type for namespaces in Linux
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -1434,6 +1434,7 @@ cfg_if! {
         pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
         pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
         pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
+        pub const NSFS_MAGIC: ::c_long = 0x6e736673;
     } else if #[cfg(target_arch = "s390x")] {
         pub const ADFS_SUPER_MAGIC: ::c_uint = 0x0000adf5;
         pub const AFFS_SUPER_MAGIC: ::c_uint = 0x0000adff;
@@ -1487,6 +1488,7 @@ cfg_if! {
         pub const UDF_SUPER_MAGIC: ::c_uint = 0x15013346;
         pub const USBDEVICE_SUPER_MAGIC: ::c_uint = 0x00009fa2;
         pub const XENFS_SUPER_MAGIC: ::c_uint = 0xabba1974;
+        pub const NSFS_MAGIC: ::c_uint = 0x6e736673;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1434,6 +1434,7 @@ cfg_if! {`
`1434`	`1434`	`pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;`
`1435`	`1435`	`pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;`
`1436`	`1436`	`pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;`
	`1437`	`+ pub const NSFS_MAGIC: ::c_long = 0x6e736673;`
`1437`	`1438`	`} else if #[cfg(target_arch = "s390x")] {`
`1438`	`1439`	`pub const ADFS_SUPER_MAGIC: ::c_uint = 0x0000adf5;`
`1439`	`1440`	`pub const AFFS_SUPER_MAGIC: ::c_uint = 0x0000adff;`
`@@ -1487,6 +1488,7 @@ cfg_if! {`
`1487`	`1488`	`pub const UDF_SUPER_MAGIC: ::c_uint = 0x15013346;`
`1488`	`1489`	`pub const USBDEVICE_SUPER_MAGIC: ::c_uint = 0x00009fa2;`
`1489`	`1490`	`pub const XENFS_SUPER_MAGIC: ::c_uint = 0xabba1974;`
	`1491`	`+ pub const NSFS_MAGIC: ::c_uint = 0x6e736673;`
`1490`	`1492`	`}`
`1491`	`1493`	`}`
`1492`	`1494`