mm: rename unlock_page_lruvec{_irq, _irqrestore} to lruvec_unlock{_irq, _irqrestore}

It is weird to use folio_lruvec_lock() variants and unlock_page_lruvec()
variants together, e.g.  locking folio and unlocking page.  So rename
unlock_page_lruvec{_irq, _irqrestore} to lruvec_unlock{_irq, _irqrestore}.

Link: https://lkml.kernel.org/r/20220621125658.64935-3-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Waiman Long <longman@redhat.com>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 318d8880d62af99a7c81e308e4fb2b342f9ede38..d0c0da7cafb7ef1ac6faad447ceebac162ee6c48 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1579,17 +1579,17 @@ static inline struct lruvec *parent_lruvec(struct lruvec *lruvec)
        return 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);
@@ -1611,7 +1611,7 @@ static inline struct lruvec *folio_lruvec_relock_irq(struct folio *folio,
                if (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);
@@ -1625,7 +1625,7 @@ static inline struct lruvec *folio_lruvec_relock_irqsave(struct folio *folio,
                if (folio_matches_lruvec(folio, locked_lruvec))
                        return locked_lruvec;
 
-               unlock_page_lruvec_irqrestore(locked_lruvec, *flags);
+               lruvec_unlock_irqrestore(locked_lruvec, *flags);
        }
 
        return folio_lruvec_lock_irqsave(folio, flags);

diff --git a/mm/compaction.c b/mm/compaction.c
index 1f89b969c12bf5d76f10b4adcf3b6dec707a1cfc..46351a14eed25bc6e6fca021ac5990b293c2752c 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -864,7 +864,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                 */
                if (!(low_pfn % COMPACT_CLUSTER_MAX)) {
                        if (locked) {
-                               unlock_page_lruvec_irqrestore(locked, flags);
+                               lruvec_unlock_irqrestore(locked, flags);
                                locked = NULL;
                        }
 
@@ -977,7 +977,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                        if (unlikely(__PageMovable(page)) &&
                                        !PageIsolated(page)) {
                                if (locked) {
-                                       unlock_page_lruvec_irqrestore(locked, flags);
+                                       lruvec_unlock_irqrestore(locked, flags);
                                        locked = NULL;
                                }
 
@@ -1060,7 +1060,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                /* 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;
@@ -1119,7 +1119,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;
                }
                put_page(page);
@@ -1135,7 +1135,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);
@@ -1167,7 +1167,7 @@ isolate_fail:
 
 isolate_abort:
        if (locked)
-               unlock_page_lruvec_irqrestore(locked, flags);
+               lruvec_unlock_irqrestore(locked, flags);
        if (page) {
                SetPageLRU(page);
                put_page(page);

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 00a786a20ccc8691b0b638fa177a7306952120f6..50fc45c88420dd829d4d53e9a6162d9f6ebaa01f 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2518,7 +2518,7 @@ static void __split_huge_page(struct page *page, struct list_head *list,
        }
 
        ClearPageCompound(head);
-       unlock_page_lruvec(lruvec);
+       lruvec_unlock(lruvec);
        /* Caller disabled irqs, so they are still disabled here */
 
        split_page_owner(head, nr);

diff --git a/mm/mlock.c b/mm/mlock.c
index 7032f6dd0ce198301598ef4811864f83bb5c2c47..d9039fb9c56b6ce48ca72200b4a90741f637b960 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -205,7 +205,7 @@ static void mlock_pagevec(struct pagevec *pvec)
        }
 
        if (lruvec)
-               unlock_page_lruvec_irq(lruvec);
+               lruvec_unlock_irq(lruvec);
        release_pages(pvec->pages, pvec->nr);
        pagevec_reinit(pvec);
 }

diff --git a/mm/swap.c b/mm/swap.c
index 1f563d857768587810e6000bbb73749bc4c834c2..127ef4db394f87fff57ec9f0b62a7db315e5980c 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -86,7 +86,7 @@ static void __page_cache_release(struct folio *folio)
                lruvec = folio_lruvec_lock_irqsave(folio, &flags);
                lruvec_del_folio(lruvec, folio);
                __folio_clear_lru_flags(folio);
-               unlock_page_lruvec_irqrestore(lruvec, flags);
+               lruvec_unlock_irqrestore(lruvec, flags);
        }
        /* See comment on folio_test_mlocked in release_pages() */
        if (unlikely(folio_test_mlocked(folio))) {
@@ -249,7 +249,7 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn)
        }
 
        if (lruvec)
-               unlock_page_lruvec_irqrestore(lruvec, flags);
+               lruvec_unlock_irqrestore(lruvec, flags);
        folios_put(fbatch->folios, folio_batch_count(fbatch));
        folio_batch_init(fbatch);
 }
@@ -392,7 +392,7 @@ static void folio_activate(struct folio *folio)
        if (folio_test_clear_lru(folio)) {
                lruvec = folio_lruvec_lock_irq(folio);
                folio_activate_fn(lruvec, folio);
-               unlock_page_lruvec_irq(lruvec);
+               lruvec_unlock_irq(lruvec);
                folio_set_lru(folio);
        }
 }
@@ -948,7 +948,7 @@ void release_pages(struct page **pages, int nr)
                 * same lruvec. The lock is held only if lruvec != NULL.
                 */
                if (lruvec && ++lock_batch == SWAP_CLUSTER_MAX) {
-                       unlock_page_lruvec_irqrestore(lruvec, flags);
+                       lruvec_unlock_irqrestore(lruvec, flags);
                        lruvec = NULL;
                }
 
@@ -957,7 +957,7 @@ void release_pages(struct page **pages, int nr)
 
                if (folio_is_zone_device(folio)) {
                        if (lruvec) {
-                               unlock_page_lruvec_irqrestore(lruvec, flags);
+                               lruvec_unlock_irqrestore(lruvec, flags);
                                lruvec = NULL;
                        }
                        if (put_devmap_managed_page(&folio->page))
@@ -972,7 +972,7 @@ void release_pages(struct page **pages, int nr)
 
                if (folio_test_large(folio)) {
                        if (lruvec) {
-                               unlock_page_lruvec_irqrestore(lruvec, flags);
+                               lruvec_unlock_irqrestore(lruvec, flags);
                                lruvec = NULL;
                        }
                        __folio_put_large(folio);
@@ -1006,7 +1006,7 @@ void release_pages(struct page **pages, int nr)
                list_add(&folio->lru, &pages_to_free);
        }
        if (lruvec)
-               unlock_page_lruvec_irqrestore(lruvec, flags);
+               lruvec_unlock_irqrestore(lruvec, flags);
 
        mem_cgroup_uncharge_list(&pages_to_free);
        free_unref_page_list(&pages_to_free);

diff --git a/mm/vmscan.c b/mm/vmscan.c
index b68b0216424d085988fb9a028a8629de66b0ebcd..6a554712ef5d8cb796264be99341ce06d8bf2a6e 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2257,7 +2257,7 @@ int folio_isolate_lru(struct folio *folio)
                folio_get(folio);
                lruvec = folio_lruvec_lock_irq(folio);
                lruvec_del_folio(lruvec, folio);
-               unlock_page_lruvec_irq(lruvec);
+               lruvec_unlock_irq(lruvec);
                ret = 0;
        }
 
@@ -4886,7 +4886,7 @@ void check_move_unevictable_pages(struct pagevec *pvec)
        if (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);
        }