From 19ad2a2eb498ce080f0a0146f0726921121ffe9f Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Sun, 11 Aug 2024 12:17:25 +0000 Subject: [PATCH] Remove module-level allowed lints in system call handlers --- kernel/aster-nix/src/syscall/clock_gettime.rs | 2 +- kernel/aster-nix/src/syscall/fork.rs | 3 --- kernel/aster-nix/src/syscall/getdents64.rs | 4 ++-- kernel/aster-nix/src/syscall/getrusage.rs | 2 -- kernel/aster-nix/src/syscall/mmap.rs | 2 -- kernel/aster-nix/src/syscall/prctl.rs | 7 +++---- kernel/aster-nix/src/syscall/select.rs | 3 +-- kernel/aster-nix/src/syscall/setitimer.rs | 2 +- kernel/aster-nix/src/syscall/sigaltstack.rs | 3 +-- kernel/aster-nix/src/syscall/stat.rs | 2 -- kernel/aster-nix/src/syscall/waitid.rs | 6 ++---- kernel/aster-nix/src/syscall/write.rs | 5 ----- 12 files changed, 11 insertions(+), 30 deletions(-) diff --git a/kernel/aster-nix/src/syscall/clock_gettime.rs b/kernel/aster-nix/src/syscall/clock_gettime.rs index 86cd6ccd4..bf7fc7e86 100644 --- a/kernel/aster-nix/src/syscall/clock_gettime.rs +++ b/kernel/aster-nix/src/syscall/clock_gettime.rs @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(non_camel_case_types)] use core::time::Duration; use int_to_c_enum::TryFromInt; @@ -34,6 +33,7 @@ pub fn sys_clock_gettime(clockid: clockid_t, timespec_addr: Vaddr) -> Result Result { - let current = current!(); let clone_args = CloneArgs::for_fork(); let child_pid = clone_child(parent_context, clone_args).unwrap(); Ok(SyscallReturn::Return(child_pid as _)) diff --git a/kernel/aster-nix/src/syscall/getdents64.rs b/kernel/aster-nix/src/syscall/getdents64.rs index 929bef272..c9d297239 100644 --- a/kernel/aster-nix/src/syscall/getdents64.rs +++ b/kernel/aster-nix/src/syscall/getdents64.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - use core::marker::PhantomData; use super::SyscallReturn; @@ -234,6 +232,7 @@ impl DirentSerializer for Dirent64 { #[repr(u8)] #[derive(Debug, Clone, Copy)] enum DirentType { + #[allow(dead_code)] DT_UNKNOWN = 0, DT_FIFO = 1, DT_CHR = 2, @@ -242,6 +241,7 @@ enum DirentType { DT_REG = 8, DT_LNK = 10, DT_SOCK = 12, + #[allow(dead_code)] DT_WHT = 14, } diff --git a/kernel/aster-nix/src/syscall/getrusage.rs b/kernel/aster-nix/src/syscall/getrusage.rs index 45840abd9..c6c2b5a4d 100644 --- a/kernel/aster-nix/src/syscall/getrusage.rs +++ b/kernel/aster-nix/src/syscall/getrusage.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(non_camel_case_types)] - use int_to_c_enum::TryFromInt; use super::SyscallReturn; diff --git a/kernel/aster-nix/src/syscall/mmap.rs b/kernel/aster-nix/src/syscall/mmap.rs index 05a5d2c26..12e4da329 100644 --- a/kernel/aster-nix/src/syscall/mmap.rs +++ b/kernel/aster-nix/src/syscall/mmap.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - //! This mod defines mmap flags and the handler to syscall mmap use align_ext::AlignExt; diff --git a/kernel/aster-nix/src/syscall/prctl.rs b/kernel/aster-nix/src/syscall/prctl.rs index c0e2a3253..7b71e63bd 100644 --- a/kernel/aster-nix/src/syscall/prctl.rs +++ b/kernel/aster-nix/src/syscall/prctl.rs @@ -1,8 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] -#![allow(unused_variables)] - use super::SyscallReturn; use crate::{ prelude::*, @@ -85,7 +82,9 @@ pub enum PrctlCmd { PR_GET_PDEATHSIG(Vaddr), PR_SET_NAME(Vaddr), PR_GET_NAME(Vaddr), + #[allow(dead_code)] PR_SET_TIMERSLACK(u64), + #[allow(dead_code)] PR_GET_TIMERSLACK, PR_SET_DUMPABLE(Dumpable), PR_GET_DUMPABLE, @@ -100,7 +99,7 @@ pub enum Dumpable { } impl PrctlCmd { - fn from_args(option: i32, arg2: u64, arg3: u64, arg4: u64, arg5: u64) -> Result { + fn from_args(option: i32, arg2: u64, _arg3: u64, _arg4: u64, _arg5: u64) -> Result { match option { PR_SET_PDEATHSIG => { let signum = SigNum::try_from(arg2 as u8)?; diff --git a/kernel/aster-nix/src/syscall/select.rs b/kernel/aster-nix/src/syscall/select.rs index 85cdf1573..bd48e1606 100644 --- a/kernel/aster-nix/src/syscall/select.rs +++ b/kernel/aster-nix/src/syscall/select.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - use core::time::Duration; use super::{ @@ -203,6 +201,7 @@ impl FdSet { } /// Equivalent to FD_CLR. + #[allow(unused)] pub fn unset(&mut self, fd: FileDesc) -> Result<()> { let fd = fd as usize; if fd >= FD_SETSIZE { diff --git a/kernel/aster-nix/src/syscall/setitimer.rs b/kernel/aster-nix/src/syscall/setitimer.rs index 08ff63bbe..c50216415 100644 --- a/kernel/aster-nix/src/syscall/setitimer.rs +++ b/kernel/aster-nix/src/syscall/setitimer.rs @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(non_camel_case_types)] use core::time::Duration; use super::SyscallReturn; @@ -12,6 +11,7 @@ use crate::{ /// `ItimerType` is used to differ the target timer for some timer-related syscalls. #[derive(Debug, Copy, Clone, TryFromInt, PartialEq)] #[repr(i32)] +#[allow(non_camel_case_types)] pub(super) enum ItimerType { ITIMER_REAL = 0, ITIMER_VIRTUAL = 1, diff --git a/kernel/aster-nix/src/syscall/sigaltstack.rs b/kernel/aster-nix/src/syscall/sigaltstack.rs index add512fdb..6b856c4bc 100644 --- a/kernel/aster-nix/src/syscall/sigaltstack.rs +++ b/kernel/aster-nix/src/syscall/sigaltstack.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - use super::SyscallReturn; use crate::{ prelude::*, @@ -111,5 +109,6 @@ impl From for stack_t { } } +#[allow(unused)] const SIGSTKSZ: usize = 8192; const MINSTKSZ: usize = 2048; diff --git a/kernel/aster-nix/src/syscall/stat.rs b/kernel/aster-nix/src/syscall/stat.rs index 5c7a817b3..df05b7e93 100644 --- a/kernel/aster-nix/src/syscall/stat.rs +++ b/kernel/aster-nix/src/syscall/stat.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - use super::SyscallReturn; use crate::{ fs::{ diff --git a/kernel/aster-nix/src/syscall/waitid.rs b/kernel/aster-nix/src/syscall/waitid.rs index 34a1be36c..8446a2853 100644 --- a/kernel/aster-nix/src/syscall/waitid.rs +++ b/kernel/aster-nix/src/syscall/waitid.rs @@ -1,7 +1,5 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(unused_variables)] - use super::SyscallReturn; use crate::{ prelude::*, @@ -11,9 +9,9 @@ use crate::{ pub fn sys_waitid( which: u64, upid: u64, - infoq_addr: u64, + _infoq_addr: u64, options: u64, - rusage_addr: u64, + _rusage_addr: u64, ) -> Result { // FIXME: what does infoq and rusage use for? let process_filter = ProcessFilter::from_which_and_id(which, upid); diff --git a/kernel/aster-nix/src/syscall/write.rs b/kernel/aster-nix/src/syscall/write.rs index c7f1722d8..3fe0e8fcf 100644 --- a/kernel/aster-nix/src/syscall/write.rs +++ b/kernel/aster-nix/src/syscall/write.rs @@ -1,13 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 -#![allow(dead_code)] - use super::SyscallReturn; use crate::{fs::file_table::FileDesc, prelude::*}; -const STDOUT: u64 = 1; -const STDERR: u64 = 2; - pub fn sys_write(fd: FileDesc, user_buf_ptr: Vaddr, user_buf_len: usize) -> Result { debug!( "fd = {}, user_buf_ptr = 0x{:x}, user_buf_len = 0x{:x}",