The patch titled
Subject: mm/damon: remove return value from before_terminate callback
has been added to the -mm tree. Its filename is
mm-damon-remove-return-value-from-before_terminate-callback.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-damon-remove-return-value-from-before_terminate-callback.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-damon-remove-return-value-from-before_terminate-callback.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Changbin Du <changbin.du@xxxxxxxxx>
Subject: 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.
Link: https://lkml.kernel.org/r/20211029005023.8895-1-changbin.du@xxxxxxxxx
Signed-off-by: Changbin Du <changbin.du@xxxxxxxxx>
Reviewed-by: SeongJae Park <sj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/damon.h | 2 +-
mm/damon/dbgfs.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
--- a/include/linux/damon.h~mm-damon-remove-return-value-from-before_terminate-callback
+++ a/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);
};
/**
--- a/mm/damon/dbgfs.c~mm-damon-remove-return-value-from-before_terminate-callback
+++ a/mm/damon/dbgfs.c
@@ -645,18 +645,17 @@ static void dbgfs_fill_ctx_dir(struct de
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)
_
Patches currently in -mm which might be from changbin.du@xxxxxxxxx are
mm-damon-remove-unnecessary-do_exit-from-kdamond.patch
mm-damon-neednt-hold-kdamond_lock-to-print-pid-of-kdamond.patch
mm-damon-simplify-stop-mechanism.patch
mm-damon-remove-return-value-from-before_terminate-callback.patch
