2021-10-29 00:53:23

by Changbin Du

Subject: [PATCH] mm/damon: remove return value from before_terminate callback

Since the return value of 'before_terminate' callback is never used,
we make it have no return value.

Signed-off-by: Changbin Du <[email protected]>
---
include/linux/damon.h | 2 +-
mm/damon/dbgfs.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/linux/damon.h b/include/linux/damon.h
index 50c6eb0dee1f..041966786270 100644
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -322,7 +322,7 @@ struct damon_callback {
int (*before_start)(struct damon_ctx *context);
int (*after_sampling)(struct damon_ctx *context);
int (*after_aggregation)(struct damon_ctx *context);
- int (*before_terminate)(struct damon_ctx *context);
+ void (*before_terminate)(struct damon_ctx *context);
};

/**
diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
index befb27a29aab..eccc14b34901 100644
--- a/mm/damon/dbgfs.c
+++ b/mm/damon/dbgfs.c
@@ -645,18 +645,17 @@ static void dbgfs_fill_ctx_dir(struct dentry *dir, struct damon_ctx *ctx)
debugfs_create_file(file_names[i], 0600, dir, ctx, fops[i]);
}

-static int dbgfs_before_terminate(struct damon_ctx *ctx)
+static void dbgfs_before_terminate(struct damon_ctx *ctx)
{
struct damon_target *t, *next;

if (!targetid_is_pid(ctx))
- return 0;
+ return;

damon_for_each_target_safe(t, next, ctx) {
put_pid((struct pid *)t->id);
damon_destroy_target(t);
}
- return 0;
}

static struct damon_ctx *dbgfs_new_ctx(void)
--
2.32.0

2021-10-29 07:23:47

by SeongJae Park

Subject: Re: [PATCH] mm/damon: remove return value from before_terminate callback

On Fri, 29 Oct 2021 08:50:23 +0800 Changbin Du <[email protected]> wrote:

> Since the return value of 'before_terminate' callback is never used,
> we make it have no return value.
>
> Signed-off-by: Changbin Du <[email protected]>

Thank you for this patch!

Reviewed-by: SeongJae Park <[email protected]>


Thanks,
SJ

> ---
> include/linux/damon.h | 2 +-
> mm/damon/dbgfs.c | 5 ++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/damon.h b/include/linux/damon.h
> index 50c6eb0dee1f..041966786270 100644
> --- a/include/linux/damon.h
> +++ b/include/linux/damon.h
> @@ -322,7 +322,7 @@ struct damon_callback {
> int (*before_start)(struct damon_ctx *context);
> int (*after_sampling)(struct damon_ctx *context);
> int (*after_aggregation)(struct damon_ctx *context);
> - int (*before_terminate)(struct damon_ctx *context);
> + void (*before_terminate)(struct damon_ctx *context);
> };
>
> /**
> diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
> index befb27a29aab..eccc14b34901 100644
> --- a/mm/damon/dbgfs.c
> +++ b/mm/damon/dbgfs.c
> @@ -645,18 +645,17 @@ static void dbgfs_fill_ctx_dir(struct dentry *dir, struct damon_ctx *ctx)
> debugfs_create_file(file_names[i], 0600, dir, ctx, fops[i]);
> }
>
> -static int dbgfs_before_terminate(struct damon_ctx *ctx)
> +static void dbgfs_before_terminate(struct damon_ctx *ctx)
> {
> struct damon_target *t, *next;
>
> if (!targetid_is_pid(ctx))
> - return 0;
> + return;
>
> damon_for_each_target_safe(t, next, ctx) {
> put_pid((struct pid *)t->id);
> damon_destroy_target(t);
> }
> - return 0;
> }
>
> static struct damon_ctx *dbgfs_new_ctx(void)
> --
> 2.32.0