lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v18 26/32] mm/mlock: remove __munlock_isolate_lru_page
    Date
    The func only has one caller, remove it to clean up code and simplify
    code.

    Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
    Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Vlastimil Babka <vbabka@suse.cz>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: linux-mm@kvack.org
    Cc: linux-kernel@vger.kernel.org
    ---
    mm/mlock.c | 22 ++++------------------
    1 file changed, 4 insertions(+), 18 deletions(-)

    diff --git a/mm/mlock.c b/mm/mlock.c
    index 46a05e6ec5ba..40a8bb79c65e 100644
    --- a/mm/mlock.c
    +++ b/mm/mlock.c
    @@ -102,23 +102,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,
    - struct lruvec *lruvec, bool getpage)
    -{
    - if (TestClearPageLRU(page)) {
    - if (getpage)
    - get_page(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()
    @@ -300,7 +283,10 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
    * We already have pin from follow_page_mask()
    * so we can spare the get_page() here.
    */
    - if (__munlock_isolate_lru_page(page, lruvec, false)) {
    + if (TestClearPageLRU(page)) {
    + enum lru_list lru = page_lru(page);
    +
    + del_page_from_lru_list(page, lruvec, lru);
    unlock_page_memcg(page);
    continue;
    } else
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2020-08-24 14:56    [W:5.184 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site