From fb8a24fbad7df632afb7a23d958b52667896465a Mon Sep 17 00:00:00 2001 From: Yifan Wu Date: Thu, 11 Feb 2021 10:26:52 +0800 Subject: [PATCH] Replace TCB.inner.block with TCB::acquire_inner_lock --- os/src/task/task.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/src/task/task.rs b/os/src/task/task.rs index b0fe7a49..e58c8ae8 100644 --- a/os/src/task/task.rs +++ b/os/src/task/task.rs @@ -118,7 +118,7 @@ impl TaskControlBlock { .ppn(); // **** hold current PCB lock - let mut inner = self.inner.lock(); + let mut inner = self.acquire_inner_lock(); // substitute memory_set inner.memory_set = memory_set; // update trap_cx ppn @@ -140,7 +140,7 @@ impl TaskControlBlock { } pub fn fork(self: &Arc) -> Arc { // ---- hold parent PCB lock - let mut parent_inner = self.inner.lock(); + let mut parent_inner = self.acquire_inner_lock(); // copy user space(include trap context) let memory_set = MemorySet::from_existed_user( &parent_inner.memory_set