Also cares the lruvec->pgdat syncing.

Signed-off-by: Alex Shi <alex....@linux.alibaba.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Michal Hocko <mho...@suse.com>
Cc: Vlastimil Babka <vba...@suse.cz>
Cc: Jason Gunthorpe <j...@ziepe.ca>
Cc: Matthew Wilcox <wi...@infradead.org>
Cc: Mauro Carvalho Chehab <mchehab+sams...@kernel.org>
Cc: Peng Fan <peng....@nxp.com>
Cc: Nikolay Borisov <nbori...@suse.com>
Cc: Ira Weiny <ira.we...@intel.com>
Cc: Andrey Ryabinin <aryabi...@virtuozzo.com>
Cc: cgro...@vger.kernel.org
Cc: linux...@kvack.org
Cc: linux-kernel@vger.kernel.org
---
 mm/swap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/swap.c b/mm/swap.c
index 63f4782af57a..2a8fe6df08fc 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -63,12 +63,13 @@ static void __page_cache_release(struct page *page)
                struct lruvec *lruvec;
                unsigned long flags;
 
-               spin_lock_irqsave(&pgdat->lruvec.lru_lock, flags);
                lruvec = mem_cgroup_page_lruvec(page, pgdat);
+               spin_lock_irqsave(&lruvec->lru_lock, flags);
+               sync_lruvec_pgdat(lruvec, pgdat);
                VM_BUG_ON_PAGE(!PageLRU(page), page);
                __ClearPageLRU(page);
                del_page_from_lru_list(page, lruvec, page_off_lru(page));
-               spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags);
+               spin_unlock_irqrestore(&lruvec->lru_lock, flags);
        }
        __ClearPageWaiters(page);
        mem_cgroup_uncharge(page);
-- 
1.8.3.1

Reply via email to