Skip to content

Commit c0997d6

Browse files
akitaSummerakitaSummer
committed
fix: fix cr
1 parent fbd70b9 commit c0997d6

6 files changed

+51
-77
lines changed

‎src/passthrough/file_handle.rs

-2
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,8 @@ impl OpenableFileHandle {
320320
#[cfg(test)]
321321
mod tests {
322322
use super::*;
323-
#[cfg(target_os = "macos")]
324323
use nix::unistd::getuid;
325324
use std::ffi::CString;
326-
#[cfg(target_os = "macos")]
327325
use std::io::Read;
328326

329327
fn generate_c_file_handle(

‎src/passthrough/passthrough_fs_linux.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Copyright (C) 2023 Alibaba Cloud. All rights reserved.
2+
// Copyright 2021 Red Hat, Inc. All rights reserved.
3+
// Use of this source code is governed by a BSD-style license that can be
4+
// found in the LICENSE-BSD-3-Clause file.
5+
16
use std::{
27
ffi::{CStr, OsString},
38
fs::File,
@@ -25,7 +30,7 @@ use super::{
2530

2631
pub type InoT = libc::ino64_t;
2732
pub type InodeMode = u32;
28-
pub type LibCStat = libc::stat64;
33+
pub type LibcStat = libc::stat64;
2934
pub type OffT = libc::off64_t;
3035
pub type StatVfs = libc::statvfs64;
3136

@@ -60,7 +65,7 @@ impl InodeHandle {
6065
}
6166
}
6267

63-
pub fn stat(&self) -> io::Result<LibCStat> {
68+
pub fn stat(&self) -> io::Result<LibcStat> {
6469
match self {
6570
InodeHandle::File(f) => stat_fd(f, None),
6671
InodeHandle::Handle(_h) => {
@@ -192,7 +197,6 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
192197
}
193198

194199
/// Create a File or File Handle for `name` under directory `dir_fd` to support `lookup()`.
195-
#[cfg(target_os = "linux")]
196200
pub fn open_file_and_handle(
197201
&self,
198202
dir: &impl AsRawFd,
@@ -274,7 +278,6 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
274278
}
275279
}
276280

277-
#[cfg(target_os = "linux")]
278281
Opcode::Fallocate => {
279282
let op = mode & !(libc::FALLOC_FL_KEEP_SIZE | libc::FALLOC_FL_UNSHARE_RANGE);
280283
match op {

‎src/passthrough/passthrough_fs_macos.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#![allow(missing_docs)]
1+
// Copyright (C) 2023 Alibaba Cloud. All rights reserved.
2+
// Copyright 2021 Red Hat, Inc. All rights reserved.
3+
// Use of this source code is governed by a BSD-style license that can be
4+
// found in the LICENSE-BSD-3-Clause file.
25

36
use std::{
47
ffi::{CStr, CString},
@@ -21,7 +24,7 @@ use super::{
2124

2225
pub type InoT = libc::ino_t;
2326
pub type InodeMode = u16;
24-
pub type LibCStat = libc::stat;
27+
pub type LibcStat = libc::stat;
2528
pub type OffT = libc::off_t;
2629
pub type StatVfs = libc::statvfs;
2730

‎src/passthrough/sync_io.rs

+37-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use std::sync::atomic::Ordering;
1414
use std::sync::Arc;
1515
use std::time::Duration;
1616

17+
#[cfg(target_os = "macos")]
18+
use super::stat::stat as stat_fd;
1719
#[cfg(target_os = "linux")]
1820
use super::util::stat_fd;
1921
use super::*;
@@ -59,6 +61,38 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
5961
Ok(())
6062
}
6163

64+
pub fn do_getattr(
65+
&self,
66+
inode: Inode,
67+
handle: Option<Handle>,
68+
) -> io::Result<(LibcStat, Duration)> {
69+
let st;
70+
let data = self.inode_map.get(inode).map_err(|e| {
71+
error!("fuse: do_getattr ino {} Not find err {:?}", inode, e);
72+
e
73+
})?;
74+
75+
// kernel sends 0 as handle in case of no_open, and it depends on fuse server to handle
76+
// this case correctly.
77+
if !self.no_open.load(Ordering::Relaxed) && handle.is_some() {
78+
// Safe as we just checked handle
79+
let hd = self.handle_map.get(handle.unwrap(), inode)?;
80+
st = stat_fd(
81+
hd.get_file(),
82+
#[cfg(target_os = "linux")]
83+
None,
84+
)
85+
} else {
86+
st = data.handle.stat();
87+
}
88+
89+
let st = st.map_err(|e| {
90+
error!("fuse: do_getattr stat failed ino {} err {:?}", inode, e);
91+
e
92+
})?;
93+
Ok((st.st, self.cfg.attr_timeout))
94+
}
95+
6296
fn do_open(
6397
&self,
6498
inode: Inode,
@@ -622,18 +656,18 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
622656
_ctx: &Context,
623657
inode: Inode,
624658
handle: Option<Handle>,
625-
) -> io::Result<(LibCStat, Duration)> {
659+
) -> io::Result<(LibcStat, Duration)> {
626660
self.do_getattr(inode, handle)
627661
}
628662

629663
fn setattr(
630664
&self,
631665
_ctx: &Context,
632666
inode: Inode,
633-
attr: LibCStat,
667+
attr: LibcStat,
634668
handle: Option<Handle>,
635669
valid: SetattrValid,
636-
) -> io::Result<(LibCStat, Duration)> {
670+
) -> io::Result<(LibcStat, Duration)> {
637671
let inode_data = self.inode_map.get(inode)?;
638672

639673
enum Data {

‎src/passthrough/sync_io_linux.rs

+1-32
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ use std::{
22
io,
33
mem::{self, size_of},
44
os::fd::{AsRawFd, RawFd},
5-
sync::atomic::Ordering,
6-
time::Duration,
75
};
86
use vm_memory::{bitmap::BitmapSlice, ByteValued};
97

@@ -13,7 +11,7 @@ use crate::{
1311
passthrough::{os_compat::LinuxDirent64, util::einval},
1412
};
1513

16-
use super::{util::stat_fd, Handle, Inode, LibCStat, OffT, PassthroughFs};
14+
use super::{Handle, Inode, OffT, PassthroughFs};
1715

1816
impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
1917
pub fn do_readdir(
@@ -67,7 +65,6 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
6765
let mut rem = &buf[..];
6866
let orig_rem_len = rem.len();
6967

70-
#[cfg(target_os = "linux")]
7168
while !rem.is_empty() {
7269
// We only use debug asserts here because these values are coming from the kernel and we
7370
// trust them implicitly.
@@ -137,32 +134,4 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
137134

138135
Ok(())
139136
}
140-
141-
pub fn do_getattr(
142-
&self,
143-
inode: Inode,
144-
handle: Option<Handle>,
145-
) -> io::Result<(LibCStat, Duration)> {
146-
let st;
147-
let data = self.inode_map.get(inode).map_err(|e| {
148-
error!("fuse: do_getattr ino {} Not find err {:?}", inode, e);
149-
e
150-
})?;
151-
152-
// kernel sends 0 as handle in case of no_open, and it depends on fuse server to handle
153-
// this case correctly.
154-
if !self.no_open.load(Ordering::Relaxed) && handle.is_some() {
155-
// Safe as we just checked handle
156-
let hd = self.handle_map.get(handle.unwrap(), inode)?;
157-
st = stat_fd(hd.get_file(), None);
158-
} else {
159-
st = data.handle.stat();
160-
}
161-
162-
let st = st.map_err(|e| {
163-
error!("fuse: do_getattr stat failed ino {} err {:?}", inode, e);
164-
e
165-
})?;
166-
Ok((st, self.cfg.attr_timeout))
167-
}
168137
}

‎src/passthrough/sync_io_macos.rs

+1-34
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::{
22
io, mem,
33
os::fd::{AsRawFd, RawFd},
4-
sync::atomic::Ordering,
5-
time::Duration,
64
};
75

86
use vm_memory::bitmap::BitmapSlice;
@@ -13,7 +11,7 @@ use crate::{
1311
passthrough::util::einval,
1412
};
1513

16-
use super::{stat::stat, Handle, Inode, LibCStat, OffT, PassthroughFs};
14+
use super::{Handle, Inode, OffT, PassthroughFs};
1715

1816
impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
1917
pub fn do_readdir(
@@ -96,9 +94,6 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
9694
add_entry(
9795
DirEntry {
9896
ino: dirent.d_ino,
99-
#[cfg(target_os = "linux")]
100-
offset: dirent.d_seekoff as u64,
101-
#[cfg(target_os = "macos")]
10297
offset: dirent.d_seekoff,
10398
type_: dirent.d_type as u32,
10499
name,
@@ -122,32 +117,4 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
122117

123118
Ok(())
124119
}
125-
126-
pub fn do_getattr(
127-
&self,
128-
inode: Inode,
129-
handle: Option<Handle>,
130-
) -> io::Result<(LibCStat, Duration)> {
131-
let st;
132-
let data = self.inode_map.get(inode).map_err(|e| {
133-
error!("fuse: do_getattr ino {} Not find err {:?}", inode, e);
134-
e
135-
})?;
136-
137-
// kernel sends 0 as handle in case of no_open, and it depends on fuse server to handle
138-
// this case correctly.
139-
if !self.no_open.load(Ordering::Relaxed) && handle.is_some() {
140-
// Safe as we just checked handle
141-
let hd = self.handle_map.get(handle.unwrap(), inode)?;
142-
st = stat(hd.get_file());
143-
} else {
144-
st = data.handle.stat();
145-
}
146-
147-
let st = st.map_err(|e| {
148-
error!("fuse: do_getattr stat failed ino {} err {:?}", inode, e);
149-
e
150-
})?;
151-
Ok((st.st, self.cfg.attr_timeout))
152-
}
153120
}

0 commit comments

Comments
 (0)