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

pxar: cleanup: move filesystem related magic numbers to tools/fs/magic.rs

Browse Source 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner
2019-08-02 15:19:32 +02:00
committed by Dietmar Maurer
parent b335f5b713
commit 91451c4355
4 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pxar/encoder.rs
View File

@ -224,8 +224,11 @@ impl <'a, W: Write> Encoder<'a, W> {
}
fn read_fat_attr(&self, fd: RawFd, magic: i64, entry: &mut CaFormatEntry) -> Result<(), Error> {
use fs::magic::*;
if magic != MSDOS_SUPER_MAGIC && magic != FUSE_SUPER_MAGIC { return Ok(()); }
if magic != MSDOS_SUPER_MAGIC && magic != FUSE_SUPER_MAGIC {
return Ok(());
}
let mut attr: u32 = 0;
@ -429,7 +432,10 @@ impl <'a, W: Write> Encoder<'a, W> {
}
match magic {
EXT4_SUPER_MAGIC | XFS_SUPER_MAGIC | FUSE_SUPER_MAGIC | ZFS_SUPER_MAGIC => {
fs::magic::EXT4_SUPER_MAGIC |
fs::magic::XFS_SUPER_MAGIC |
fs::magic::FUSE_SUPER_MAGIC |
fs::magic::ZFS_SUPER_MAGIC => {
let mut fsxattr = fs::FSXAttr::default();
let res = unsafe {
fs::fs_ioc_fsgetxattr(fd, &mut fsxattr)
@ -1108,10 +1114,12 @@ fn detect_fs_type(fd: RawFd) -> Result<i64, Error> {
#[inline(always)]
pub fn is_temporary_file_system(magic: i64) -> bool {
use fs::magic::*;
magic == RAMFS_MAGIC || magic == TMPFS_MAGIC
}
pub fn is_virtual_file_system(magic: i64) -> bool {
use fs::magic::*;
match magic {
BINFMTFS_MAGIC |