mm-damon-sysfs-move-targets-setup-code-to-a-separated-function.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs: move targets setup code to a separated function
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-move-targets-setup-code-to-a-separated-function.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon/sysfs: move targets setup code to a separated function
This commit separates DAMON sysfs interface's monitoring context targets setup code to a new function for better readability.
Signed-off-by SeongJae Park <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/damon/sysfs.c | 49 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-)
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-sysfs-move-targets-setup-code-to-a-separated-function +28 -21
@@ -2120,6 +2120,31 @@ static int damon_sysfs_set_regions(strucreturn 0 ; } +static int damon_sysfs_add_target (struct damon_sysfs_target *sys_target, +struct damon_ctx *ctx) +{ +struct damon_target *t =damon_new_target (); +int err = -EINVAL ; + +if (!t) +return -ENOMEM ; +if (ctx->ops.id ==DAMON_OPS_VADDR || + ctx->ops.id ==DAMON_OPS_FVADDR ) { + t->pid =find_get_pid (sys_target->pid); +if (!t->pid) + goto destroy_targets_out; + } +damon_add_target (ctx, t); + err =damon_sysfs_set_regions (t, sys_target->regions); +if (err) + goto destroy_targets_out; +return 0 ; + +destroy_targets_out: +damon_sysfs_destroy_targets (ctx); +return err; +} +static int damon_sysfs_set_targets (struct damon_ctx *ctx,struct damon_sysfs_targets *sysfs_targets) {
@@ -2130,28 +2155,10 @@ static int damon_sysfs_set_targets(strucreturn -EINVAL ;for (i =0 ; i < sysfs_targets->nr; i++) { -struct damon_sysfs_target *sys_target = - sysfs_targets->targets_arr[i]; -struct damon_target *t =damon_new_target (); - -if (!t) { -damon_sysfs_destroy_targets (ctx); -return -ENOMEM ; - } -if (ctx->ops.id ==DAMON_OPS_VADDR || - ctx->ops.id ==DAMON_OPS_FVADDR ) { - t->pid =find_get_pid (sys_target->pid); -if (!t->pid) { -damon_sysfs_destroy_targets (ctx); -return -EINVAL ; - } - } -damon_add_target (ctx, t); - err =damon_sysfs_set_regions (t, sys_target->regions); -if (err) { -damon_sysfs_destroy_targets (ctx); + err =damon_sysfs_add_target ( + sysfs_targets->targets_arr[i], ctx); +if (err)return err; - } }return 0 ; }
_
Patches currently in -mm which might be from [email protected] are