[pbs-devel] [PATCH proxmox-backup 1/2] client: pxar: fix minor formatting issues

[pbs-devel] [PATCH proxmox-backup 1/2] client: pxar: fix minor formatting issues

[Christian Ebner]

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-client/src/pxar/create.rs     | 13 ++++++++++---
 proxmox-backup-client/src/main.rs |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
index 75376c0c..fa16abfe 100644
--- a/pbs-client/src/pxar/create.rs
+++ b/pbs-client/src/pxar/create.rs
@@ -161,7 +161,7 @@ where
         feature_flags & fs_feature_flags,
         fs_magic,
         &mut fs_feature_flags,
-        options.skip_e2big_xattr
+        options.skip_e2big_xattr,
     )
     .context("failed to get metadata for source directory")?;
 
@@ -545,7 +545,7 @@ impl Archiver {
             self.flags(),
             self.fs_magic,
             &mut self.fs_feature_flags,
-            self.skip_e2big_xattr
+            self.skip_e2big_xattr,
         )?;
 
         let match_path = PathBuf::from("/").join(self.path.clone());
@@ -787,7 +787,14 @@ fn get_metadata(
         ..Default::default()
     };
 
-    get_xattr_fcaps_acl(&mut meta, fd, &proc_path, flags, fs_feature_flags, skip_e2big_xattr)?;
+    get_xattr_fcaps_acl(
+        &mut meta,
+        fd,
+        &proc_path,
+        flags,
+        fs_feature_flags,
+        skip_e2big_xattr,
+    )?;
     get_chattr(&mut meta, fd)?;
     get_fat_attr(&mut meta, fd, fs_magic)?;
     get_quota_project_id(&mut meta, fd, flags, fs_magic)?;
diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index fdf43747..546275cb 100644
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -1000,7 +1000,7 @@ async fn create_backup(
                     patterns: pattern_list.clone(),
                     entries_max: entries_max as usize,
                     skip_lost_and_found,
-                    skip_e2big_xattr
+                    skip_e2big_xattr,
                 };
 
                 let upload_options = UploadOptions {
-- 
2.39.2

[pbs-devel] [PATCH proxmox-backup 2/2] client: pxar: early return on exclude pattern match

[Christian Ebner]

Move the exclude pattern matching further up to avoid unnecessary
instantiation of the metadata object, not needed if the entry was
matched.

No functional change intended.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-client/src/pxar/create.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
index fa16abfe..60efb0ce 100644
--- a/pbs-client/src/pxar/create.rs
+++ b/pbs-client/src/pxar/create.rs
@@ -539,15 +539,6 @@ impl Archiver {
             None => return Ok(()),
         };
 
-        let metadata = get_metadata(
-            fd.as_raw_fd(),
-            stat,
-            self.flags(),
-            self.fs_magic,
-            &mut self.fs_feature_flags,
-            self.skip_e2big_xattr,
-        )?;
-
         let match_path = PathBuf::from("/").join(self.path.clone());
         if self
             .patterns
@@ -557,6 +548,15 @@ impl Archiver {
             return Ok(());
         }
 
+        let metadata = get_metadata(
+            fd.as_raw_fd(),
+            stat,
+            self.flags(),
+            self.fs_magic,
+            &mut self.fs_feature_flags,
+            self.skip_e2big_xattr,
+        )?;
+
         let file_name: &Path = OsStr::from_bytes(c_file_name.to_bytes()).as_ref();
         match metadata.file_type() {
             mode::IFREG => {
-- 
2.39.2

[pbs-devel] applied: [PATCH proxmox-backup 1/2] client: pxar: fix minor formatting issues

[Dietmar Maurer]

applied both patches