tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client: pxar: refactor catalog encoding for directories

Browse Source 
Move the catalog directory start and end encoding from `add_entry`
to the `add_directory`, the latter being called by the previous.

By this, the `add_entry` method can be reused to walk the filesystem
tree in the context of an enabled lookahead cache without encoding
anything.

No functional change intended.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2024-05-24 19:11:10 +02:00 committed by Fabian Grünbichler
parent 6f23976247
commit 3149454511
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pbs-client/src/pxar/create.rs
View File

@ -690,24 +690,15 @@ impl Archiver {
}
mode::IFDIR => {
let dir = Dir::from_fd(fd.into_raw_fd())?;
if let Some(ref catalog) = self.catalog {
catalog.lock().unwrap().start_directory(c_file_name)?;
}
let result = self
.add_directory(
encoder,
previous_metadata,
dir,
c_file_name,
&metadata,
stat,
)
.await;
if let Some(ref catalog) = self.catalog {
catalog.lock().unwrap().end_directory()?;
}
result
self.add_directory(
encoder,
previous_metadata,
dir,
c_file_name,
&metadata,
stat,
)
.await
}
mode::IFSOCK => {
if let Some(ref catalog) = self.catalog {
@ -757,12 +748,15 @@ impl Archiver {
encoder: &mut Encoder<'_, T>,
previous_metadata_accessor: &mut Option<Directory<MetadataArchiveReader>>,
dir: Dir,
dir_name: &CStr,
c_dir_name: &CStr,
metadata: &Metadata,
stat: &FileStat,
) -> Result<(), Error> {
let dir_name = OsStr::from_bytes(dir_name.to_bytes());
let dir_name = OsStr::from_bytes(c_dir_name.to_bytes());
if let Some(ref catalog) = self.catalog {
catalog.lock().unwrap().start_directory(c_dir_name)?;
}
encoder.create_directory(dir_name, metadata).await?;
let old_fs_magic = self.fs_magic;
@ -804,6 +798,10 @@ impl Archiver {
self.current_st_dev = old_st_dev;
encoder.finish().await?;
if let Some(ref catalog) = self.catalog {
catalog.lock().unwrap().end_directory()?;
}
result
}