Commit f59ae147 authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton
Browse files

mm/damon/sysfs: remove damon_sysfs_destroy_targets() 

The function was introduced for putting pids and deallocating unnecessary
targets.  Hence it is called before damon_destroy_ctx().  Now vaddr puts
pid for each target destruction (cleanup_target()).  damon_destroy_ctx()
deallocates the targets anyway.  So damon_sysfs_destroy_targets() has no
reason to exist.  Remove it.

Link: https://lkml.kernel.org/r/20250712195016.151108-12-sj@kernel.org


Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ff01aba6

mm/damon/sysfs.c

+3 −20
Original line number Diff line number Diff line
@@ -1295,14 +1295,6 @@ static int damon_sysfs_set_attrs(struct damon_ctx *ctx, 
	return damon_set_attrs(ctx, &attrs);

}



static void damon_sysfs_destroy_targets(struct damon_ctx *ctx)

{

	struct damon_target *t, *next;



	damon_for_each_target_safe(t, next, ctx)

		damon_destroy_target(t, ctx);

}



static int damon_sysfs_set_regions(struct damon_target *t,

		struct damon_sysfs_regions *sysfs_regions)

{
@@ -1337,7 +1329,6 @@ 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;
@@ -1345,16 +1336,10 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, 
	if (damon_target_has_pid(ctx)) {

		t->pid = find_get_pid(sys_target->pid);

		if (!t->pid)

			goto destroy_targets_out;

			/* caller will destroy targets */

			return -EINVAL;

	}

	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;

	return damon_sysfs_set_regions(t, sys_target->regions);

}



static int damon_sysfs_add_targets(struct damon_ctx *ctx,
@@ -1458,13 +1443,11 @@ static int damon_sysfs_commit_input(void *data) 
	test_ctx = damon_new_ctx();

	err = damon_commit_ctx(test_ctx, param_ctx);

	if (err) {

		damon_sysfs_destroy_targets(test_ctx);

		damon_destroy_ctx(test_ctx);

		goto out;

	}

	err = damon_commit_ctx(kdamond->damon_ctx, param_ctx);

out:

	damon_sysfs_destroy_targets(param_ctx);

	damon_destroy_ctx(param_ctx);

	return err;

}