Skip to content

Commit 0d58c66

Browse files
diqiu50diqiu50
committed
Update
1 parent 2a3a70a commit 0d58c66

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎clients/filesystem-fuse/src/fuse_api_handle.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use std::num::NonZeroU32;
3535
use std::time::{Duration, SystemTime};
3636

3737
pub(crate) struct FuseApiHandle<T: RawFileSystem> {
38-
local_fs: T,
38+
fs: T,
3939
default_ttl: Duration,
4040
fs_context: FileSystemContext,
4141
}
@@ -46,14 +46,14 @@ impl<T: RawFileSystem> FuseApiHandle<T> {
4646

4747
pub fn new(fs: T, context: FileSystemContext) -> Self {
4848
Self {
49-
local_fs: fs,
49+
fs: fs,
5050
default_ttl: Self::DEFAULT_ATTR_TTL,
5151
fs_context: context,
5252
}
5353
}
5454

5555
pub async fn get_file_path(&self, file_id: u64) -> String {
56-
self.local_fs.get_file_path(file_id).await
56+
self.fs.get_file_path(file_id).await
5757
}
5858

5959
async fn get_modified_file_stat(
@@ -63,7 +63,7 @@ impl<T: RawFileSystem> FuseApiHandle<T> {
6363
atime: Option<Timestamp>,
6464
mtime: Option<Timestamp>,
6565
) -> Result<FileStat, Errno> {
66-
let mut file_stat = self.local_fs.stat(file_id).await?;
66+
let mut file_stat = self.fs.stat(file_id).await?;
6767

6868
if let Some(size) = size {
6969
file_stat.size = size;
@@ -83,7 +83,7 @@ impl<T: RawFileSystem> FuseApiHandle<T> {
8383

8484
impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
8585
async fn init(&self, _req: Request) -> fuse3::Result<ReplyInit> {
86-
self.local_fs.init().await;
86+
self.fs.init().await;
8787
Ok(ReplyInit {
8888
max_write: NonZeroU32::new(Self::DEFAULT_MAX_WRITE_SIZE).unwrap(),
8989
})
@@ -100,7 +100,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
100100
name: &OsStr,
101101
) -> fuse3::Result<ReplyEntry> {
102102
let name = name.to_string_lossy();
103-
let file_stat = self.local_fs.lookup(parent, &name).await?;
103+
let file_stat = self.fs.lookup(parent, &name).await?;
104104
Ok(ReplyEntry {
105105
ttl: self.default_ttl,
106106
attr: fstat_to_file_attr(&file_stat, &self.fs_context),
@@ -117,10 +117,10 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
117117
) -> fuse3::Result<ReplyAttr> {
118118
// check the opened file file_id is the same as the inode
119119
if let Some(fh) = fh {
120-
self.local_fs.valid_file_id(inode, fh).await?;
120+
self.fs.valid_file_id(inode, fh).await?;
121121
}
122122

123-
let file_stat = self.local_fs.stat(inode).await?;
123+
let file_stat = self.fs.stat(inode).await?;
124124
Ok(ReplyAttr {
125125
ttl: self.default_ttl,
126126
attr: fstat_to_file_attr(&file_stat, &self.fs_context),
@@ -136,14 +136,14 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
136136
) -> fuse3::Result<ReplyAttr> {
137137
// check the opened file file_id is the same as the inode
138138
if let Some(fh) = fh {
139-
self.local_fs.valid_file_id(inode, fh).await?;
139+
self.fs.valid_file_id(inode, fh).await?;
140140
}
141141

142142
let new_file_stat = self
143143
.get_modified_file_stat(inode, set_attr.size, set_attr.atime, set_attr.mtime)
144144
.await?;
145145
let attr = fstat_to_file_attr(&new_file_stat, &self.fs_context);
146-
self.local_fs.set_attr(inode, &new_file_stat).await?;
146+
self.fs.set_attr(inode, &new_file_stat).await?;
147147
Ok(ReplyAttr {
148148
ttl: self.default_ttl,
149149
attr: attr,
@@ -159,7 +159,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
159159
_umask: u32,
160160
) -> fuse3::Result<ReplyEntry> {
161161
let name = name.to_string_lossy();
162-
let handle_id = self.local_fs.create_dir(parent, &name).await?;
162+
let handle_id = self.fs.create_dir(parent, &name).await?;
163163
Ok(ReplyEntry {
164164
ttl: self.default_ttl,
165165
attr: dummy_file_attr(
@@ -174,18 +174,18 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
174174

175175
async fn unlink(&self, _req: Request, parent: Inode, name: &OsStr) -> fuse3::Result<()> {
176176
let name = name.to_string_lossy();
177-
self.local_fs.remove_file(parent, &name).await?;
177+
self.fs.remove_file(parent, &name).await?;
178178
Ok(())
179179
}
180180

181181
async fn rmdir(&self, _req: Request, parent: Inode, name: &OsStr) -> fuse3::Result<()> {
182182
let name = name.to_string_lossy();
183-
self.local_fs.remove_dir(parent, &name).await?;
183+
self.fs.remove_dir(parent, &name).await?;
184184
Ok(())
185185
}
186186

187187
async fn open(&self, _req: Request, inode: Inode, flags: u32) -> fuse3::Result<ReplyOpen> {
188-
let file_handle = self.local_fs.open_file(inode, flags).await?;
188+
let file_handle = self.fs.open_file(inode, flags).await?;
189189
Ok(ReplyOpen {
190190
fh: file_handle.handle_id,
191191
flags: flags,
@@ -200,7 +200,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
200200
offset: u64,
201201
size: u32,
202202
) -> fuse3::Result<ReplyData> {
203-
let data = self.local_fs.read(inode, fh, offset, size).await?;
203+
let data = self.fs.read(inode, fh, offset, size).await?;
204204
Ok(ReplyData { data: data })
205205
}
206206

@@ -214,7 +214,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
214214
_write_flags: u32,
215215
_flags: u32,
216216
) -> fuse3::Result<ReplyWrite> {
217-
let written = self.local_fs.write(inode, fh, offset, data).await?;
217+
let written = self.fs.write(inode, fh, offset, data).await?;
218218
Ok(ReplyWrite { written: written })
219219
}
220220

@@ -241,11 +241,11 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
241241
_lock_owner: u64,
242242
_flush: bool,
243243
) -> fuse3::Result<()> {
244-
self.local_fs.close_file(inode, fh).await
244+
self.fs.close_file(inode, fh).await
245245
}
246246

247247
async fn opendir(&self, _req: Request, inode: Inode, flags: u32) -> fuse3::Result<ReplyOpen> {
248-
let file_handle = self.local_fs.open_dir(inode, flags).await?;
248+
let file_handle = self.fs.open_dir(inode, flags).await?;
249249
Ok(ReplyOpen {
250250
fh: file_handle.handle_id,
251251
flags: flags,
@@ -265,8 +265,8 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
265265
_fh: u64,
266266
offset: i64,
267267
) -> fuse3::Result<ReplyDirectory<Self::DirEntryStream<'a>>> {
268-
let current = self.local_fs.stat(parent).await?;
269-
let files = self.local_fs.read_dir(parent).await?;
268+
let current = self.fs.stat(parent).await?;
269+
let files = self.fs.read_dir(parent).await?;
270270
let entries_stream =
271271
stream::iter(files.into_iter().enumerate().map(|(index, file_stat)| {
272272
Ok(DirectoryEntry {
@@ -306,7 +306,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
306306
fh: u64,
307307
_flags: u32,
308308
) -> fuse3::Result<()> {
309-
self.local_fs.close_file(inode, fh).await
309+
self.fs.close_file(inode, fh).await
310310
}
311311

312312
async fn create(
@@ -318,7 +318,7 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
318318
flags: u32,
319319
) -> fuse3::Result<ReplyCreated> {
320320
let name = name.to_string_lossy();
321-
let file_handle = self.local_fs.create_file(parent, &name, flags).await?;
321+
let file_handle = self.fs.create_file(parent, &name, flags).await?;
322322
Ok(ReplyCreated {
323323
ttl: self.default_ttl,
324324
attr: dummy_file_attr(
@@ -347,8 +347,8 @@ impl<T: RawFileSystem> Filesystem for FuseApiHandle<T> {
347347
offset: u64,
348348
_lock_owner: u64,
349349
) -> fuse3::Result<ReplyDirectoryPlus<Self::DirEntryPlusStream<'a>>> {
350-
let current = self.local_fs.stat(parent).await?;
351-
let files = self.local_fs.read_dir(parent).await?;
350+
let current = self.fs.stat(parent).await?;
351+
let files = self.fs.read_dir(parent).await?;
352352
let entries_stream =
353353
stream::iter(files.into_iter().enumerate().map(|(index, file_stat)| {
354354
Ok(DirectoryEntryPlus {

0 commit comments

Comments
 (0)