update-20240529-0347

kernel/src/arch/x86_64/pci/pci.rs

@@ -11,7 +11,7 @@ use crate::init::initcall::INITCALL_SUBSYS;
 use crate::mm::PhysAddr;
 
 use acpi::mcfg::Mcfg;
-use log::{error, warn};
+use log::warn;
 use system_error::SystemError;
 use unified_init::macros::unified_init;
 

kernel/src/mm/fault.rs

@@ -61,11 +61,9 @@ pub struct PageFaultMessage {
 impl PageFaultMessage {
     pub fn new(vma: Arc<LockedVMA>, address: VirtAddr, flags: FaultFlags) -> Self {
         let guard = vma.lock();
-        let file_pgoff = if let Some(file_page_offset) = guard.file_page_offset() {
-            Some(((address - guard.region().start()) >> MMArch::PAGE_SHIFT) + file_page_offset)
-        } else {
-            None
-        };
+        let file_pgoff = guard.file_page_offset().map(|file_page_offset| {
+            ((address - guard.region().start()) >> MMArch::PAGE_SHIFT) + file_page_offset
+        });
         Self {
             vma: vma.clone(),
             address,