Skip to content

Commit 53a6b77

Browse files
committed
Fuse readdir: Changed manual min functionality to min fn
1 parent 5d87cb3 commit 53a6b77

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/fs/fuse.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -840,13 +840,10 @@ impl ObjectInterface for FuseDirectoryHandle {
840840
.lock()
841841
.send_command(cmd, rsp_payload_len)?;
842842

843-
let len: usize = if rsp.headers.out_header.len as usize - mem::size_of::<fuse_out_header>()
844-
>= usize::try_from(len).unwrap()
845-
{
846-
len.try_into().unwrap()
847-
} else {
848-
(rsp.headers.out_header.len as usize) - mem::size_of::<fuse_out_header>()
849-
};
843+
let len = usize::min(
844+
MAX_READ_LEN,
845+
rsp.headers.out_header.len as usize - mem::size_of::<fuse_out_header>(),
846+
);
850847

851848
if len <= core::mem::size_of::<fuse_dirent>() {
852849
debug!("FUSE no new dirs");

0 commit comments

Comments
 (0)