From 93ff5b49b35761ebc6c5f167df97c5eab1910aba Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Tue, 14 Sep 2021 14:52:39 +0800 Subject: [PATCH] Revert "uce: pagecache reading scenario add shmem support" This reverts commit 71e735a492eaf791ab4b23ae53a494d12a6c46be. Signed-off-by: Yang Yingliang --- mm/shmem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index ae62bba63a24..8a41ab86152c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2661,12 +2661,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) * Ok, we have the page, and it's up-to-date, so * now we can copy it to user space... */ -#ifdef CONFIG_UCE_KERNEL_RECOVERY - if (is_pagecache_reading_kernel_recovery_enable()) - ret = copy_page_to_iter_generic_read(page, offset, nr, to); - else - ret = copy_page_to_iter(page, offset, nr, to); -#endif + ret = copy_page_to_iter(page, offset, nr, to); retval += ret; offset += ret; index += offset >> PAGE_SHIFT; -- GitLab