Skip to content

Commit 4a09591

Browse files
committed
Fuse readdir: Changed manual min functionality to min fn
1 parent 7fa981b commit 4a09591

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

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

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

0 commit comments

Comments
 (0)