mm-mlock-remove-__munlock_isolate_lru_page.patch removed from -mm tree
The patch titled
Subject: mm/mlock: remove __munlock_isolate_lru_page()
has been removed from the -mm tree. Its filename was
mm-mlock-remove-__munlock_isolate_lru_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alex Shi <[email protected]>
Subject: mm/mlock: remove __munlock_isolate_lru_page()
__munlock_isolate_lru_page() only has one caller, remove it to clean up and simplify code.
---
mm/mlock.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-)
mm/mlock.c renamed from mm/mlock.c~mm-mlock-remove-__munlock_isolate_lru_page +9 -22
@@ -106,26 +106,6 @@ void mlock_vma_page(struct page *page) }/* -* Isolate a page from LRU with optional get_page() pin. -* Assumes lru_lock already held and page already pinned. -*/ -static bool __munlock_isolate_lru_page (struct page *page,bool getpage) -{ -if (PageLRU (page)) { -struct lruvec *lruvec; - - lruvec =mem_cgroup_page_lruvec (page,page_pgdat (page)); -if (getpage) -get_page (page); -ClearPageLRU (page); -del_page_from_lru_list (page, lruvec,page_lru (page)); -return true; - } - -return false; -} - -/* * Finish munlock after successful page isolation * * Page must be locked. This is a wrapper for try_to_munlock()
@@ -296,9 +276,16 @@ static void __munlock_pagevec(struct pag* We already have pin from follow_page_mask() * so we can spare the get_page() here. */ -if (__munlock_isolate_lru_page (page, false)) +if (PageLRU (page)) { +struct lruvec *lruvec; + +ClearPageLRU (page); + lruvec =mem_cgroup_page_lruvec (page, +page_pgdat (page)); +del_page_from_lru_list (page, lruvec, +page_lru (page));continue ; -else + }else __munlock_isolation_failed (page); }else { delta_munlocked++;
_
Patches currently in -mm which might be from [email protected] are
mm-vmscan-__isolate_lru_page_prepare-clean-up.patch fs-nilfs2-remove-some-unused-macros-to-tame-gcc.patch gcov-fix-kernel-doc-markup-issue.patch mm-memcg-bail-early-from-swap-accounting-if-memcg-disabled.patch mm-memcg-warning-on-memcg-after-readahead-page-charged.patch mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch