tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use new proxmox::sys::linux::magic

Browse Source
This commit is contained in:
Dietmar Maurer 2019-08-03 09:28:57 +02:00
parent 4ea0f7d95b
commit b86f263ced
4 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pxar/encoder.rs
View File

@ -225,7 +225,7 @@ impl <'a, W: Write> Encoder<'a, W> {
}
fn read_fat_attr(&self, fd: RawFd, magic: i64, entry: &mut PxarEntry) -> Result<(), Error> {
use fs::magic::*;
use proxmox::sys::linux::magic::*;
if magic != MSDOS_SUPER_MAGIC && magic != FUSE_SUPER_MAGIC {
return Ok(());
@ -432,11 +432,13 @@ impl <'a, W: Write> Encoder<'a, W> {
return Ok(None);
}
use proxmox::sys::linux::magic::*;
match magic {
fs::magic::EXT4_SUPER_MAGIC |
fs::magic::XFS_SUPER_MAGIC |
fs::magic::FUSE_SUPER_MAGIC |
fs::magic::ZFS_SUPER_MAGIC => {
EXT4_SUPER_MAGIC |
XFS_SUPER_MAGIC |
FUSE_SUPER_MAGIC |
ZFS_SUPER_MAGIC => {
let mut fsxattr = fs::FSXAttr::default();
let res = unsafe {
fs::fs_ioc_fsgetxattr(fd, &mut fsxattr)
@ -1115,12 +1117,12 @@ fn detect_fs_type(fd: RawFd) -> Result<i64, Error> {
#[inline(always)]
pub fn is_temporary_file_system(magic: i64) -> bool {
use fs::magic::*;
use proxmox::sys::linux::magic::*;
magic == RAMFS_MAGIC || magic == TMPFS_MAGIC
}
pub fn is_virtual_file_system(magic: i64) -> bool {
use fs::magic::*;
use proxmox::sys::linux::magic::*;
match magic {
BINFMTFS_MAGIC |

2
src/pxar/flags.rs
View File

@ -198,7 +198,7 @@ pub fn feature_flags_from_fat_attr(attr: u32) -> u64 {
/// Return the supported *pxar* feature flags based on the magic number of the filesystem.
pub fn feature_flags_from_magic(magic: i64) -> u64 {
use crate::tools::fs::magic::*;
use proxmox::sys::linux::magic::*;
match magic {
MSDOS_SUPER_MAGIC => {
WITH_2SEC_TIME|

2
src/tools/fs.rs
View File

@ -259,5 +259,3 @@ impl Default for FSXAttr {
}
}
}
pub (crate) mod magic;

30
src/tools/fs/magic.rs
View File

@ -1,30 +0,0 @@
//! Filesystem related magic numbers
// from /usr/include/linux/magic.h
// and from casync util.h
pub const BINFMTFS_MAGIC: i64 = 0x42494e4d;
pub const CGROUP2_SUPER_MAGIC: i64 = 0x63677270;
pub const CGROUP_SUPER_MAGIC: i64 = 0x0027e0eb;
pub const CONFIGFS_MAGIC: i64 = 0x62656570;
pub const DEBUGFS_MAGIC: i64 = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: i64 = 0x00001cd1;
pub const EFIVARFS_MAGIC: i64 = 0xde5e81e4;
pub const FUSE_CTL_SUPER_MAGIC: i64 = 0x65735543;
pub const HUGETLBFS_MAGIC: i64 = 0x958458f6;
pub const MQUEUE_MAGIC: i64 = 0x19800202;
pub const NFSD_MAGIC: i64 = 0x6e667364;
pub const PROC_SUPER_MAGIC: i64 = 0x00009fa0;
pub const PSTOREFS_MAGIC: i64 = 0x6165676C;
pub const RPCAUTH_GSSMAGIC: i64 = 0x67596969;
pub const SECURITYFS_MAGIC: i64 = 0x73636673;
pub const SELINUX_MAGIC: i64 = 0xf97cff8c;
pub const SMACK_MAGIC: i64 = 0x43415d53;
pub const RAMFS_MAGIC: i64 = 0x858458f6;
pub const TMPFS_MAGIC: i64 = 0x01021994;
pub const SYSFS_MAGIC: i64 = 0x62656572;
pub const MSDOS_SUPER_MAGIC: i64 = 0x00004d44;
pub const BTRFS_SUPER_MAGIC: i64 = 0x9123683E;
pub const FUSE_SUPER_MAGIC: i64 = 0x65735546;
pub const EXT4_SUPER_MAGIC: i64 = 0x0000EF53;
pub const XFS_SUPER_MAGIC: i64 = 0x58465342;
pub const ZFS_SUPER_MAGIC: i64 = 0x2FC12FC1;