[PATCH v13 04/14] Revert "include/linux/mm_inline.h: fold __update_lru_size() into its sole caller"

Yu Zhao yuzhao at google.com
Wed Jul 6 15:00:13 PDT 2022


This patch undoes the following refactor:
commit 289ccba18af4 ("include/linux/mm_inline.h: fold __update_lru_size() into its sole caller")

The upcoming changes to include/linux/mm_inline.h will reuse
__update_lru_size().

Signed-off-by: Yu Zhao <yuzhao at google.com>
Reviewed-by: Miaohe Lin <linmiaohe at huawei.com>
Acked-by: Brian Geffon <bgeffon at google.com>
Acked-by: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
Acked-by: Oleksandr Natalenko <oleksandr at natalenko.name>
Acked-by: Steven Barrett <steven at liquorix.net>
Acked-by: Suleiman Souhlal <suleiman at google.com>
Tested-by: Daniel Byrne <djbyrne at mtu.edu>
Tested-by: Donald Carr <d at chaos-reins.com>
Tested-by: Holger Hoffstätte <holger at applied-asynchrony.com>
Tested-by: Konstantin Kharlamov <Hi-Angel at yandex.ru>
Tested-by: Shuang Zhai <szhai2 at cs.rochester.edu>
Tested-by: Sofia Trinh <sofia.trinh at edi.works>
Tested-by: Vaibhav Jain <vaibhav at linux.ibm.com>
---
 include/linux/mm_inline.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 7b25b53c474a..fb8aadb81cd6 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -34,7 +34,7 @@ static inline int page_is_file_lru(struct page *page)
 	return folio_is_file_lru(page_folio(page));
 }
 
-static __always_inline void update_lru_size(struct lruvec *lruvec,
+static __always_inline void __update_lru_size(struct lruvec *lruvec,
 				enum lru_list lru, enum zone_type zid,
 				long nr_pages)
 {
@@ -43,6 +43,13 @@ static __always_inline void update_lru_size(struct lruvec *lruvec,
 	__mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages);
 	__mod_zone_page_state(&pgdat->node_zones[zid],
 				NR_ZONE_LRU_BASE + lru, nr_pages);
+}
+
+static __always_inline void update_lru_size(struct lruvec *lruvec,
+				enum lru_list lru, enum zone_type zid,
+				long nr_pages)
+{
+	__update_lru_size(lruvec, lru, zid, nr_pages);
 #ifdef CONFIG_MEMCG
 	mem_cgroup_update_lru_size(lruvec, lru, zid, nr_pages);
 #endif
-- 
2.37.0.rc0.161.g10f37bed90-goog




More information about the linux-arm-kernel mailing list