From 71474bc6829b3cd831df7ce24ea059557996524d Mon Sep 17 00:00:00 2001 From: LoGin Date: Sat, 16 Sep 2023 16:16:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddrop=20fd=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=8F=E8=BF=B0=E7=AC=A6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=B8=8D=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98=20(#382)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/src/filesystem/vfs/file.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel/src/filesystem/vfs/file.rs b/kernel/src/filesystem/vfs/file.rs index c9fd07ce..c0d8ef27 100644 --- a/kernel/src/filesystem/vfs/file.rs +++ b/kernel/src/filesystem/vfs/file.rs @@ -503,11 +503,7 @@ impl FileDescriptorVec { return Err(SystemError::EBADF); } - let f = self.get_file_by_fd(fd); - if f.is_none() { - // 如果文件描述符不存在,报错 - return Err(SystemError::EBADF); - } + self.get_file_by_fd(fd).ok_or(SystemError::EBADF)?; // 把文件描述符数组对应位置设置为空 let file = self.fds[fd as usize].take().unwrap();