From b5d6e2c20bc3ce421761387825d2acab9ae4d4a9 Mon Sep 17 00:00:00 2001 From: KAAAsS Date: Thu, 21 Apr 2022 00:54:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20fs=5Fdispatch=20=E4=B8=AD=20pmo=20?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=AE=8C=E6=88=90=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab5/user/lab5/apps/init.c | 1 - lab5/user/lab5/tmpfs/tmpfs_main.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lab5/user/lab5/apps/init.c b/lab5/user/lab5/apps/init.c index dd83e0e..acfa870 100644 --- a/lab5/user/lab5/apps/init.c +++ b/lab5/user/lab5/apps/init.c @@ -223,7 +223,6 @@ int fs_read_all(char *path, void **ret_buf) *ret_buf = buf; // 读入文件 - // FIXME: 读取 1 页以上会遇到 warning: vmr overlap int pos = 0; while (size - pos > 0) { int cur = fs_read(path, pos, PAGE_SIZE); diff --git a/lab5/user/lab5/tmpfs/tmpfs_main.c b/lab5/user/lab5/tmpfs/tmpfs_main.c index 995cb13..4ad73f6 100644 --- a/lab5/user/lab5/tmpfs/tmpfs_main.c +++ b/lab5/user/lab5/tmpfs/tmpfs_main.c @@ -52,6 +52,7 @@ static void fs_dispatch(ipc_msg_t * ipc_msg) break; } ret = fs_server_write(fr->path, fr->offset, fr->buff, fr->count); + usys_unmap_pmo(SELF_CAP, cap, (u64) fr->buff); break; } case FS_REQ_READ:{ @@ -61,6 +62,7 @@ static void fs_dispatch(ipc_msg_t * ipc_msg) break; } ret = fs_server_read(fr->path, fr->offset, fr->buff, fr->count); + usys_unmap_pmo(SELF_CAP, cap, (u64) fr->buff); break; } case FS_REQ_GET_SIZE:{