xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: mm/damon: remove return value from before_terminate callback

Browse Source 
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@gmail.com
Signed-off-by: Changbin Du <changbin.du@gmail.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 658f9ae761b5965893727dd4edcdad56e5a439bb)

Bug: 228223814
Signed-off-by: Hailong Tu <tuhailong@oppo.com>
Change-Id: Ida44623827a7a667118a2af329f6e58a57941fc9
This commit is contained in:
Changbin Du
2021-11-05 13:48:27 -07:00
committed by Hailong Tu
parent b48f28f49c
commit 55a2d2f5a7
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/damon.h
View File

@@ -322,7 +322,7 @@ struct damon_callback {
int (*before_start)(struct damon_ctx *context); int (*before_start)(struct damon_ctx *context);
int (*after_sampling)(struct damon_ctx *context); int (*after_sampling)(struct damon_ctx *context);
int (*after_aggregation)(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);
}; };
/** /**

5
mm/damon/dbgfs.c
View File

@@ -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]); 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; struct damon_target *t, *next;
if (!targetid_is_pid(ctx)) if (!targetid_is_pid(ctx))
return 0; return;
damon_for_each_target_safe(t, next, ctx) { damon_for_each_target_safe(t, next, ctx) {
put_pid((struct pid *)t->id); put_pid((struct pid *)t->id);
damon_destroy_target(t); damon_destroy_target(t);
} }
return 0;
} }
static struct damon_ctx *dbgfs_new_ctx(void) static struct damon_ctx *dbgfs_new_ctx(void)