| Message ID | 20240611024516.1375191-1-yosryahmed@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/3] mm: zswap: rename is_zswap_enabled() to zswap_is_enabled() | expand |
On Tue, Jun 11, 2024 at 2:45 PM Yosry Ahmed <yosryahmed@google.com> wrote: > > In preparation of introducing a similar function, rename > is_zswap_enabled() to use zswap_* prefix like other zswap functions. > > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> Reviewed-by: Barry Song <baohua@kernel.org> > --- > include/linux/zswap.h | 4 ++-- > mm/memcontrol.c | 2 +- > mm/zswap.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > index 2a85b941db975..ce5e7bfe8f1ec 100644 > --- a/include/linux/zswap.h > +++ b/include/linux/zswap.h > @@ -35,7 +35,7 @@ void zswap_swapoff(int type); > void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg); > void zswap_lruvec_state_init(struct lruvec *lruvec); > void zswap_folio_swapin(struct folio *folio); > -bool is_zswap_enabled(void); > +bool zswap_is_enabled(void); > #else > > struct zswap_lruvec_state {}; > @@ -60,7 +60,7 @@ static inline void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) {} > static inline void zswap_lruvec_state_init(struct lruvec *lruvec) {} > static inline void zswap_folio_swapin(struct folio *folio) {} > > -static inline bool is_zswap_enabled(void) > +static inline bool zswap_is_enabled(void) > { > return false; > } > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 1303ed01bb5e5..a811dfff10cda 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -8469,7 +8469,7 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) > bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) > { > /* if zswap is disabled, do not block pages going to the swapping device */ > - return !is_zswap_enabled() || !memcg || READ_ONCE(memcg->zswap_writeback); > + return !zswap_is_enabled() || !memcg || READ_ONCE(memcg->zswap_writeback); > } > > static u64 zswap_current_read(struct cgroup_subsys_state *css, > diff --git a/mm/zswap.c b/mm/zswap.c > index b9b35ef86d9be..a8c8dd8cfe6f5 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -131,7 +131,7 @@ static bool zswap_shrinker_enabled = IS_ENABLED( > CONFIG_ZSWAP_SHRINKER_DEFAULT_ON); > module_param_named(shrinker_enabled, zswap_shrinker_enabled, bool, 0644); > > -bool is_zswap_enabled(void) > +bool zswap_is_enabled(void) > { > return zswap_enabled; > } > -- > 2.45.2.505.gda0bf45e8d-goog >
On Mon, Jun 10, 2024 at 7:45 PM Yosry Ahmed <yosryahmed@google.com> wrote: > > In preparation of introducing a similar function, rename > is_zswap_enabled() to use zswap_* prefix like other zswap functions. > > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> Ooops this is my bad :) Thanks for making it more consistent, Yosry! Reviewed-by: Nhat Pham <nphamcs@gmail.com>
diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 2a85b941db975..ce5e7bfe8f1ec 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -35,7 +35,7 @@ void zswap_swapoff(int type); void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg); void zswap_lruvec_state_init(struct lruvec *lruvec); void zswap_folio_swapin(struct folio *folio); -bool is_zswap_enabled(void); +bool zswap_is_enabled(void); #else struct zswap_lruvec_state {}; @@ -60,7 +60,7 @@ static inline void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) {} static inline void zswap_lruvec_state_init(struct lruvec *lruvec) {} static inline void zswap_folio_swapin(struct folio *folio) {} -static inline bool is_zswap_enabled(void) +static inline bool zswap_is_enabled(void) { return false; } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1303ed01bb5e5..a811dfff10cda 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -8469,7 +8469,7 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) { /* if zswap is disabled, do not block pages going to the swapping device */ - return !is_zswap_enabled() || !memcg || READ_ONCE(memcg->zswap_writeback); + return !zswap_is_enabled() || !memcg || READ_ONCE(memcg->zswap_writeback); } static u64 zswap_current_read(struct cgroup_subsys_state *css, diff --git a/mm/zswap.c b/mm/zswap.c index b9b35ef86d9be..a8c8dd8cfe6f5 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -131,7 +131,7 @@ static bool zswap_shrinker_enabled = IS_ENABLED( CONFIG_ZSWAP_SHRINKER_DEFAULT_ON); module_param_named(shrinker_enabled, zswap_shrinker_enabled, bool, 0644); -bool is_zswap_enabled(void) +bool zswap_is_enabled(void) { return zswap_enabled; }
In preparation of introducing a similar function, rename is_zswap_enabled() to use zswap_* prefix like other zswap functions. Signed-off-by: Yosry Ahmed <yosryahmed@google.com> --- include/linux/zswap.h | 4 ++-- mm/memcontrol.c | 2 +- mm/zswap.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)