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

pxar: add support for storing/restoring the quota project id on ZFS 

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-07-29 17:21:35 +02:00 committed by Dietmar Maurer
parent 6a87910949
commit 9731c8b862
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pxar/encoder.rs
View File

@ -419,7 +419,7 @@ impl <'a, W: Write> Encoder<'a, W> {
}) })
} }
/// Read the project quota id for an inode, supported on ext4/XFS/FUSE/(ZFS TODO impl) filesystems /// Read the quota project id for an inode, supported on ext4/XFS/FUSE/ZFS filesystems
fn read_quota_project_id(&self, fd: RawFd, magic: i64, stat: &FileStat) -> Result<Option<CaFormatQuotaProjID>, Error> { fn read_quota_project_id(&self, fd: RawFd, magic: i64, stat: &FileStat) -> Result<Option<CaFormatQuotaProjID>, Error> {
if !(is_directory(&stat) || is_reg_file(&stat)) { if !(is_directory(&stat) || is_reg_file(&stat)) {
return Ok(None); return Ok(None);
@ -429,8 +429,7 @@ impl <'a, W: Write> Encoder<'a, W> {
} }
match magic { match magic {
//TODO ZFS quota EXT4_SUPER_MAGIC | XFS_SUPER_MAGIC | FUSE_SUPER_MAGIC | ZFS_SUPER_MAGIC => {
EXT4_SUPER_MAGIC | XFS_SUPER_MAGIC | FUSE_SUPER_MAGIC => {
let mut fsxattr = fs::FSXAttr::default(); let mut fsxattr = fs::FSXAttr::default();
let res = unsafe { let res = unsafe {
fs::fs_ioc_fsgetxattr(fd, &mut fsxattr) fs::fs_ioc_fsgetxattr(fd, &mut fsxattr)

27
src/pxar/format_definition.rs
View File

@ -409,6 +409,7 @@ pub const BTRFS_SUPER_MAGIC: i64 = 0x9123683E;
pub const FUSE_SUPER_MAGIC: i64 = 0x65735546; pub const FUSE_SUPER_MAGIC: i64 = 0x65735546;
pub const EXT4_SUPER_MAGIC: i64 = 0x0000EF53; pub const EXT4_SUPER_MAGIC: i64 = 0x0000EF53;
pub const XFS_SUPER_MAGIC: i64 = 0x58465342; pub const XFS_SUPER_MAGIC: i64 = 0x58465342;
pub const ZFS_SUPER_MAGIC: i64 = 0x2FC12FC1;
/// Definitions of typical feature flags for the *pxar* encoder/decoder. /// Definitions of typical feature flags for the *pxar* encoder/decoder.
/// By this expensive syscalls for unsupported features are avoided. /// By this expensive syscalls for unsupported features are avoided.
@ -542,6 +543,32 @@ pub fn feature_flags_from_magic(magic: i64) -> u64 {
CA_FORMAT_WITH_FCAPS| CA_FORMAT_WITH_FCAPS|
CA_FORMAT_WITH_QUOTA_PROJID CA_FORMAT_WITH_QUOTA_PROJID
}, },
ZFS_SUPER_MAGIC => {
CA_FORMAT_WITH_16BIT_UIDS|
CA_FORMAT_WITH_32BIT_UIDS|
CA_FORMAT_WITH_USER_NAMES|
CA_FORMAT_WITH_SEC_TIME|
CA_FORMAT_WITH_USEC_TIME|
CA_FORMAT_WITH_NSEC_TIME|
CA_FORMAT_WITH_2SEC_TIME|
CA_FORMAT_WITH_READ_ONLY|
CA_FORMAT_WITH_PERMISSIONS|
CA_FORMAT_WITH_SYMLINKS|
CA_FORMAT_WITH_DEVICE_NODES|
CA_FORMAT_WITH_FIFOS|
CA_FORMAT_WITH_SOCKETS|
CA_FORMAT_WITH_FLAG_APPEND|
CA_FORMAT_WITH_FLAG_NOATIME|
CA_FORMAT_WITH_FLAG_NODUMP|
CA_FORMAT_WITH_FLAG_DIRSYNC|
CA_FORMAT_WITH_FLAG_IMMUTABLE|
CA_FORMAT_WITH_FLAG_SYNC|
CA_FORMAT_WITH_XATTRS|
CA_FORMAT_WITH_ACL|
CA_FORMAT_WITH_SELINUX|
CA_FORMAT_WITH_FCAPS|
CA_FORMAT_WITH_QUOTA_PROJID
},
BTRFS_SUPER_MAGIC => { BTRFS_SUPER_MAGIC => {
CA_FORMAT_WITH_16BIT_UIDS| CA_FORMAT_WITH_16BIT_UIDS|
CA_FORMAT_WITH_32BIT_UIDS| CA_FORMAT_WITH_32BIT_UIDS|