Skip to content

Commit 3236c32

Browse files
committed
Fuse readdir: Changed manual min functionality to min fn
1 parent e28a23f commit 3236c32

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
@@ -859,13 +859,10 @@ impl ObjectInterface for FuseDirectoryHandle {
859859
.lock()
860860
.send_command(cmd, rsp_payload_len)?;
861861

862-
let len: usize = if rsp.headers.out_header.len as usize - mem::size_of::<fuse_out_header>()
863-
>= usize::try_from(len).unwrap()
864-
{
865-
len.try_into().unwrap()
866-
} else {
867-
(rsp.headers.out_header.len as usize) - mem::size_of::<fuse_out_header>()
868-
};
862+
let len = usize::min(
863+
MAX_READ_LEN,
864+
rsp.headers.out_header.len as usize - mem::size_of::<fuse_out_header>(),
865+
);
869866

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

0 commit comments

Comments
 (0)