proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-05-30 21:46:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pbs-client: drop use of deprecated RawFdNum

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-10-19 14:17:59 +02:00
parent 4cceaf3a2d
commit 76c2912e64
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ use pxar::Metadata;
use proxmox_io::vec; use proxmox_io::vec;
use proxmox_lang::c_str; use proxmox_lang::c_str;
use proxmox_sys::error::SysError; use proxmox_sys::error::SysError;
use proxmox_sys::fd::RawFdNum;
use proxmox_sys::fs::{self, acl, xattr}; use proxmox_sys::fs::{self, acl, xattr};
use pbs_datastore::catalog::BackupCatalogWriter; use pbs_datastore::catalog::BackupCatalogWriter;
@ -320,13 +319,13 @@ impl Archiver {
let mut noatime = OFlag::O_NOATIME; let mut noatime = OFlag::O_NOATIME;
loop { loop {
return match proxmox_sys::fd::openat( return match proxmox_sys::fd::Fd::openat(
&unsafe { RawFdNum::from_raw_fd(parent) }, &parent,
file_name, file_name,
oflags | noatime, oflags | noatime,
Mode::empty(), Mode::empty(),
) { ) {
Ok(fd) => Ok(Some(fd)), Ok(fd) => Ok(Some(fd.into())),
Err(Errno::ENOENT) => { Err(Errno::ENOENT) => {
if existed { if existed {
self.report_vanished_file()?; self.report_vanished_file()?;

7
pbs-client/src/pxar/metadata.rs
View File

@ -1,5 +1,5 @@
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::io::{AsRawFd, RawFd};
use std::path::Path; use std::path::Path;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
@ -11,7 +11,6 @@ use pxar::Metadata;
use proxmox_sys::c_result; use proxmox_sys::c_result;
use proxmox_sys::error::SysError; use proxmox_sys::error::SysError;
use proxmox_sys::fd::RawFdNum;
use proxmox_sys::fs::{self, acl, xattr}; use proxmox_sys::fs::{self, acl, xattr};
use crate::pxar::tools::perms_from_metadata; use crate::pxar::tools::perms_from_metadata;
@ -66,8 +65,8 @@ pub fn apply_at(
path_info: &Path, path_info: &Path,
on_error: &mut (dyn FnMut(Error) -> Result<(), Error> + Send), on_error: &mut (dyn FnMut(Error) -> Result<(), Error> + Send),
) -> Result<(), Error> { ) -> Result<(), Error> {
let fd = proxmox_sys::fd::openat( let fd = proxmox_sys::fd::Fd::openat(
&unsafe { RawFdNum::from_raw_fd(parent) }, &parent,
file_name, file_name,
OFlag::O_PATH | OFlag::O_CLOEXEC | OFlag::O_NOFOLLOW, OFlag::O_PATH | OFlag::O_CLOEXEC | OFlag::O_NOFOLLOW,
Mode::empty(), Mode::empty(),