cgroup: switch to css_is_online() helper

Use the new css_is_online() helper that has been introduced to check css
online state, instead of testing the CSS_ONLINE flag directly. This
improves readability and centralizes the state check logic.

No functional changes intended.

Signed-off-by: Chen Ridong <chenridong@huawei.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 6800886c4d1047b28c5c07613a1a1b256e982a95..5dd6e89a6d29ec827d51b94fb2498546be454879 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -981,7 +981,7 @@ void wbc_account_cgroup_owner(struct writeback_control *wbc, struct folio *folio
 
        css = mem_cgroup_css_from_folio(folio);
        /* dead cgroups shouldn't contribute to inode ownership arbitration */
-       if (!(css->flags & CSS_ONLINE))
+       if (!css_is_online(css))
                return;
 
        id = css->id;

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 0651865a4564fab9feb5c1d1aa24bd9543826cbe..6a48398a1f4e7e8399ca26dc69258883bb486057 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -893,7 +893,7 @@ static inline bool mem_cgroup_online(struct mem_cgroup *memcg)
 {
        if (mem_cgroup_disabled())
                return true;
-       return !!(memcg->css.flags & CSS_ONLINE);
+       return css_is_online(&memcg->css);
 }
 
 void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index e717208cfb1855488475df6a306587e7eeca638a..34d6d4d99f972b7687f7d51c55e82d5c77484685 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4948,7 +4948,7 @@ bool css_has_online_children(struct cgroup_subsys_state *css)
 
        rcu_read_lock();
        css_for_each_child(child, css) {
-               if (child->flags & CSS_ONLINE) {
+               if (css_is_online(child)) {
                        ret = true;
                        break;
                }
@@ -5753,7 +5753,7 @@ static void offline_css(struct cgroup_subsys_state *css)
 
        lockdep_assert_held(&cgroup_mutex);
 
-       if (!(css->flags & CSS_ONLINE))
+       if (!css_is_online(css))
                return;
 
        if (ss->css_offline)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index be810c1fbfc3e1898a66900fb57514a6ee09012b..e2e49f4ec9e0e2a242b2e9c2b975be6c7d6eb4f8 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -281,7 +281,7 @@ ino_t page_cgroup_ino(struct page *page)
        /* page_folio() is racy here, but the entire function is racy anyway */
        memcg = folio_memcg_check(page_folio(page));
 
-       while (memcg && !(memcg->css.flags & CSS_ONLINE))
+       while (memcg && !css_is_online(&memcg->css))
                memcg = parent_mem_cgroup(memcg);
        if (memcg)
                ino = cgroup_ino(memcg->css.cgroup);

diff --git a/mm/page_owner.c b/mm/page_owner.c
index a702456842061b4be7b4c7a45d8431e8745b7ef6..27d19f01009c73776eb1610a2d78b6c66b22a707 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -530,7 +530,7 @@ static inline int print_page_owner_memcg(char *kbuf, size_t count, int ret,
        if (!memcg)
                goto out_unlock;
 
-       online = (memcg->css.flags & CSS_ONLINE);
+       online = css_is_online(&memcg->css);
        cgroup_name(memcg->css.cgroup, name, sizeof(name));
        ret += scnprintf(kbuf + ret, count - ret,
                        "Charged %sto %smemcg %s\n",