pbs-client: drop deprecated Fd usage

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
index f193b05f97f608330105e2e1c1751447abe798b8..c73f69cd97a43444e8c66a481b41cd900b4c2c38 100644 (file)
--- a/pbs-client/src/pxar/create.rs
+++ b/pbs-client/src/pxar/create.rs
@@ -3,7 +3,7 @@ use std::ffi::{CStr, CString, OsStr};
 use std::fmt;
 use std::io::{self, Read, Write};
 use std::os::unix::ffi::OsStrExt;
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
@@ -22,7 +22,6 @@ use pxar::Metadata;
 use proxmox_io::vec;
 use proxmox_lang::c_str;
 use proxmox_sys::error::SysError;
-use proxmox_sys::fd::Fd;
 use proxmox_sys::fd::RawFdNum;
 use proxmox_sys::fs::{self, acl, xattr};
 
@@ -315,13 +314,13 @@ impl Archiver {
         file_name: &CStr,
         oflags: OFlag,
         existed: bool,
-    ) -> Result<Option<Fd>, Error> {
+    ) -> Result<Option<OwnedFd>, Error> {
         // common flags we always want to use:
         let oflags = oflags | OFlag::O_CLOEXEC | OFlag::O_NOCTTY;
 
         let mut noatime = OFlag::O_NOATIME;
         loop {
-            return match Fd::openat(
+            return match proxmox_sys::fd::openat(
                 &unsafe { RawFdNum::from_raw_fd(parent) },
                 file_name,
                 oflags | noatime,
@@ -725,7 +724,7 @@ impl Archiver {
     async fn add_regular_file<T: SeqWrite + Send>(
         &mut self,
         encoder: &mut Encoder<'_, T>,
-        fd: Fd,
+        fd: OwnedFd,
         file_name: &Path,
         metadata: &Metadata,
         file_size: u64,
@@ -764,7 +763,7 @@ impl Archiver {
     async fn add_symlink<T: SeqWrite + Send>(
         &mut self,
         encoder: &mut Encoder<'_, T>,
-        fd: Fd,
+        fd: OwnedFd,
         file_name: &Path,
         metadata: &Metadata,
     ) -> Result<(), Error> {

diff --git a/pbs-client/src/pxar/metadata.rs b/pbs-client/src/pxar/metadata.rs
index be1911a725bbbb9657672696e67d8d9830267c1a..d5c903100ac7085c884ba98d31bf51723b6f7608 100644 (file)
--- a/pbs-client/src/pxar/metadata.rs
+++ b/pbs-client/src/pxar/metadata.rs
@@ -66,7 +66,7 @@ pub fn apply_at(
     path_info: &Path,
     on_error: &mut (dyn FnMut(Error) -> Result<(), Error> + Send),
 ) -> Result<(), Error> {
-    let fd = proxmox_sys::fd::Fd::openat(
+    let fd = proxmox_sys::fd::openat(
         &unsafe { RawFdNum::from_raw_fd(parent) },
         file_name,
         OFlag::O_PATH | OFlag::O_CLOEXEC | OFlag::O_NOFOLLOW,