mm/damon/sysfs-schemes: rename *_set_{schemes,scheme_filters,quota_score,schemes}()

The functions were for updating DAMON structs that may or may not be
partially populated.  Hence it was not for only adding items, but also
removing unnecessary items and updating items in-place.  A previous commit
has changed the functions to assume the structs are not partially
populated, and do only adding items.  Make the names better explain the
behavior.

Link: https://lkml.kernel.org/r/20240618181809.82078-9-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/damon/sysfs-common.h b/mm/damon/sysfs-common.h
index a63f51577cffdbd2e46a165438f1585442ed1f7c..9a18f3c535d31503769cabcfd23194a440074250 100644 (file)
--- a/mm/damon/sysfs-common.h
+++ b/mm/damon/sysfs-common.h
@@ -38,7 +38,7 @@ void damon_sysfs_schemes_rm_dirs(struct damon_sysfs_schemes *schemes);
 
 extern const struct kobj_type damon_sysfs_schemes_ktype;
 
-int damon_sysfs_set_schemes(struct damon_ctx *ctx,
+int damon_sysfs_add_schemes(struct damon_ctx *ctx,
                struct damon_sysfs_schemes *sysfs_schemes);
 
 void damon_sysfs_schemes_update_stats(

diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c
index 77c0265dff5c9a92648d6ffab4f4d34832051ea4..b095457380b560a3cff68e291dbaeb3ae45aa9c7 100644 (file)
--- a/mm/damon/sysfs-schemes.c
+++ b/mm/damon/sysfs-schemes.c
@@ -1908,7 +1908,7 @@ static int damon_sysfs_memcg_path_to_id(char *memcg_path, unsigned short *id)
        return found ? 0 : -EINVAL;
 }
 
-static int damon_sysfs_set_scheme_filters(struct damos *scheme,
+static int damon_sysfs_add_scheme_filters(struct damos *scheme,
                struct damon_sysfs_scheme_filters *sysfs_filters)
 {
        int i;
@@ -1947,7 +1947,7 @@ static int damon_sysfs_set_scheme_filters(struct damos *scheme,
        return 0;
 }
 
-static int damos_sysfs_set_quota_score(
+static int damos_sysfs_add_quota_score(
                struct damos_sysfs_quota_goals *sysfs_goals,
                struct damos_quota *quota)
 {
@@ -1990,7 +1990,7 @@ int damos_sysfs_set_quota_scores(struct damon_sysfs_schemes *sysfs_schemes,
                        break;
 
                sysfs_scheme = sysfs_schemes->schemes_arr[i];
-               err = damos_sysfs_set_quota_score(sysfs_scheme->quotas->goals,
+               err = damos_sysfs_add_quota_score(sysfs_scheme->quotas->goals,
                                &quota);
                if (err) {
                        damos_for_each_quota_goal_safe(g, g_next, &quota)
@@ -2070,13 +2070,13 @@ static struct damos *damon_sysfs_mk_scheme(
        if (!scheme)
                return NULL;
 
-       err = damos_sysfs_set_quota_score(sysfs_quotas->goals, &scheme->quota);
+       err = damos_sysfs_add_quota_score(sysfs_quotas->goals, &scheme->quota);
        if (err) {
                damon_destroy_scheme(scheme);
                return NULL;
        }
 
-       err = damon_sysfs_set_scheme_filters(scheme, sysfs_filters);
+       err = damon_sysfs_add_scheme_filters(scheme, sysfs_filters);
        if (err) {
                damon_destroy_scheme(scheme);
                return NULL;
@@ -2084,7 +2084,7 @@ static struct damos *damon_sysfs_mk_scheme(
        return scheme;
 }
 
-int damon_sysfs_set_schemes(struct damon_ctx *ctx,
+int damon_sysfs_add_schemes(struct damon_ctx *ctx,
                struct damon_sysfs_schemes *sysfs_schemes)
 {
        int i;

diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
index f83ea6a166c62fea86b3e17be723a0f3b8f6b1eb..cffc755e7775d6d67536a0393b6859c1c0c432a2 100644 (file)
--- a/mm/damon/sysfs.c
+++ b/mm/damon/sysfs.c
@@ -1286,7 +1286,7 @@ static int damon_sysfs_apply_inputs(struct damon_ctx *ctx,
        err = damon_sysfs_add_targets(ctx, sys_ctx->targets);
        if (err)
                return err;
-       return damon_sysfs_set_schemes(ctx, sys_ctx->schemes);
+       return damon_sysfs_add_schemes(ctx, sys_ctx->schemes);
 }
 
 static struct damon_ctx *damon_sysfs_build_ctx(