Commit a8220e72 authored by Chen Wandun's avatar Chen Wandun Committed by Zheng Zengkai
Browse files

Revert "mm/page_cache_limit: do shrink_page_cache when adding page to page cache" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4HOXK


CVE: NA

--------------------------------

This reverts commit 9fea105d.
This feature will be reimplement.

Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
Reviewed-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f7356019

include/linux/page_cache_limit.h

+0 −2
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ unsigned long __shrink_node_page_cache(int nid, gfp_t mask, 
		unsigned long nr_to_reclaim, enum page_cache_reclaim_flag flag);

void kpagecache_limitd_stop(int nid);

int kpagecache_limitd_run(int nid);

void wakeup_all_kpagecache_limitd(void);

#else

static inline void kpagecache_limitd_stop(int nid) {}

static inline int kpagecache_limitd_run(int nid) { return 0; }

static inline void wakeup_all_kpagecache_limitd(void) {}

#endif



#endif

include/linux/pagemap.h

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/bitops.h>

#include <linux/hardirq.h> /* for in_interrupt() */

#include <linux/hugetlb_inline.h>

#include <linux/page_cache_limit.h>



struct pagevec;
@@ -778,7 +777,6 @@ static inline int add_to_page_cache(struct page *page, 
{

	int error;



	wakeup_all_kpagecache_limitd();

	__SetPageLocked(page);

	error = add_to_page_cache_locked(page, mapping, offset, gfp_mask);

	if (unlikely(error))

mm/filemap.c

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/psi.h>

#include <linux/ramfs.h>

#include <linux/page_idle.h>

#include <linux/page_cache_limit.h>

#include "internal.h"



#define CREATE_TRACE_POINTS
@@ -924,7 +923,6 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, 
	void *shadow = NULL;

	int ret;



	wakeup_all_kpagecache_limitd();

	__SetPageLocked(page);

	ret = __add_to_page_cache_locked(page, mapping, offset,

					 gfp_mask, &shadow);