mm-rename-unlock_page_lruvec_irq-and-its-variants.patch removed from -mm tree
The quilt patch titled
Subject: mm: rename unlock_page_lruvec_irq and its variants
has been removed from the -mm tree. Its filename was
mm-rename-unlock_page_lruvec_irq-and-its-variants.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Muchun Song <[email protected]>
Subject: mm: rename unlock_page_lruvec_irq and its variants
Date: Thu, 5 Mar 2026 19:52:21 +0800
It is inappropriate to use folio_lruvec_lock() variants in conjunction with unlock_page_lruvec() variants, as this involves the inconsistent operation of locking a folio while unlocking a page. To rectify this, the functions unlock_page_lruvec{_irq, _irqrestore} are renamed to lruvec_unlock{_irq,_irqrestore}.
---
include/linux/memcontrol.h | 10 +++++----- mm/compaction.c | 14 +++++++------- mm/huge_memory.c | 2 +- mm/mlock.c | 2 +- mm/swap.c | 12 ++++++------ mm/vmscan.c | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-rename-unlock_page_lruvec_irq-and-its-variants +5 -5
@@ -1479,17 +1479,17 @@ static inline struct lruvec *parent_lruvreturn mem_cgroup_lruvec (memcg,lruvec_pgdat (lruvec)); } -static inline void unlock_page_lruvec (struct lruvec *lruvec) +static inline void lruvec_unlock (struct lruvec *lruvec) {spin_unlock (&lruvec->lru_lock); } -static inline void unlock_page_lruvec_irq (struct lruvec *lruvec) +static inline void lruvec_unlock_irq (struct lruvec *lruvec) {spin_unlock_irq (&lruvec->lru_lock); } -static inline void unlock_page_lruvec_irqrestore (struct lruvec *lruvec, +static inline void lruvec_unlock_irqrestore (struct lruvec *lruvec,unsigned long flags) {spin_unlock_irqrestore (&lruvec->lru_lock, flags);
@@ -1511,7 +1511,7 @@ static inline struct lruvec *folio_lruveif (folio_matches_lruvec (folio, locked_lruvec))return locked_lruvec; -unlock_page_lruvec_irq (locked_lruvec); +lruvec_unlock_irq (locked_lruvec); }return folio_lruvec_lock_irq (folio);
@@ -1525,7 +1525,7 @@ static inline void folio_lruvec_relock_iif (folio_matches_lruvec (folio, *lruvecp))return ; -unlock_page_lruvec_irqrestore (*lruvecp, *flags); +lruvec_unlock_irqrestore (*lruvecp, *flags); } *lruvecp =folio_lruvec_lock_irqsave (folio, flags);
mm/compaction.c renamed from mm/compaction.c~mm-rename-unlock_page_lruvec_irq-and-its-variants +7 -7
@@ -913,7 +913,7 @@ isolate_migratepages_block(struct compac*/ if (!(low_pfn %COMPACT_CLUSTER_MAX )) {if (locked) { -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags); locked =NULL ; }
@@ -964,7 +964,7 @@ isolate_migratepages_block(struct compac }/* for alloc_contig case */ if (locked) { -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags); locked =NULL ; }
@@ -1053,7 +1053,7 @@ isolate_migratepages_block(struct compacif (unlikely (page_has_movable_ops (page)) && !PageMovableOpsIsolated (page)) {if (locked) { -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags); locked =NULL ; }
@@ -1158,7 +1158,7 @@ isolate_migratepages_block(struct compac/* If we already hold the lock, we can skip some rechecking */ if (lruvec != locked) {if (locked) -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags);compact_lock_irqsave (&lruvec->lru_lock, &flags, cc); locked = lruvec;
@@ -1226,7 +1226,7 @@ isolate_success_no_list: isolate_fail_put:/* Avoid potential deadlock in freeing page under lru_lock */ if (locked) { -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags); locked =NULL ; }folio_put (folio);
@@ -1242,7 +1242,7 @@ isolate_fail:*/ if (nr_isolated) {if (locked) { -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags); locked =NULL ; }putback_movable_pages (&cc->migratepages);
@@ -1274,7 +1274,7 @@ isolate_fail: isolate_abort:if (locked) -unlock_page_lruvec_irqrestore (locked, flags); +lruvec_unlock_irqrestore (locked, flags);if (folio) {folio_set_lru (folio);folio_put (folio);
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rename-unlock_page_lruvec_irq-and-its-variants +1 -1
@@ -3994,7 +3994,7 @@ static int __folio_freeze_and_split_unmafolio_ref_unfreeze (folio,folio_cache_ref_count (folio) +1 );if (do_lru) -unlock_page_lruvec (lruvec); +lruvec_unlock (lruvec);if (ci)swap_cluster_unlock (ci);
mm/mlock.c renamed from mm/mlock.c~mm-rename-unlock_page_lruvec_irq-and-its-variants +1 -1
@@ -205,7 +205,7 @@ static void mlock_folio_batch(struct fol }if (lruvec) -unlock_page_lruvec_irq (lruvec); +lruvec_unlock_irq (lruvec);folios_put (fbatch); }
mm/swap.c renamed from mm/swap.c~mm-rename-unlock_page_lruvec_irq-and-its-variants +6 -6
@@ -91,7 +91,7 @@ static void page_cache_release(struct fo__page_cache_release (folio, &lruvec, &flags);if (lruvec) -unlock_page_lruvec_irqrestore (lruvec, flags); +lruvec_unlock_irqrestore (lruvec, flags); }void __folio_put (struct folio *folio)
@@ -175,7 +175,7 @@ static void folio_batch_move_lru(struct }if (lruvec) -unlock_page_lruvec_irqrestore (lruvec, flags); +lruvec_unlock_irqrestore (lruvec, flags);folios_put (fbatch); }
@@ -349,7 +349,7 @@ void folio_activate(struct folio *folio) lruvec =folio_lruvec_lock_irq (folio);lru_activate (lruvec, folio); -unlock_page_lruvec_irq (lruvec); +lruvec_unlock_irq (lruvec); folio_set_lru(folio); }#endif
@@ -963,7 +963,7 @@ void folios_put_refs(struct folio_batchif (folio_is_zone_device (folio)) {if (lruvec) { -unlock_page_lruvec_irqrestore (lruvec, flags); +lruvec_unlock_irqrestore (lruvec, flags); lruvec =NULL ; }if (folio_ref_sub_and_test (folio, nr_refs))
@@ -977,7 +977,7 @@ void folios_put_refs(struct folio_batch/* hugetlb has its own memcg */ if (folio_test_hugetlb (folio)) {if (lruvec) { -unlock_page_lruvec_irqrestore (lruvec, flags); +lruvec_unlock_irqrestore (lruvec, flags); lruvec =NULL ; }free_huge_folio (folio);
@@ -991,7 +991,7 @@ void folios_put_refs(struct folio_batch j++; }if (lruvec) -unlock_page_lruvec_irqrestore (lruvec, flags); +lruvec_unlock_irqrestore (lruvec, flags);if (!j) {folio_batch_reinit (folios);return ;
mm/vmscan.c renamed from mm/vmscan.c~mm-rename-unlock_page_lruvec_irq-and-its-variants +2 -2
@@ -1831,7 +1831,7 @@ bool folio_isolate_lru(struct folio *folfolio_get (folio); lruvec =folio_lruvec_lock_irq (folio);lruvec_del_folio (lruvec, folio); -unlock_page_lruvec_irq (lruvec); +lruvec_unlock_irq (lruvec); ret = true; }
@@ -7898,7 +7898,7 @@ void check_move_unevictable_folios(strucif (lruvec) {__count_vm_events (UNEVICTABLE_PGRESCUED , pgrescued);__count_vm_events (UNEVICTABLE_PGSCANNED , pgscanned); -unlock_page_lruvec_irq (lruvec); +lruvec_unlock_irq (lruvec); }else if (pgscanned) {count_vm_events (UNEVICTABLE_PGSCANNED , pgscanned); }
_
Patches currently in -mm which might be from [email protected] are