Commit 025b7799 authored by ZhangPeng's avatar ZhangPeng Committed by Andrew Morton
Browse files

mm/memcg: remove return value of mem_cgroup_scan_tasks() 

No user checks the return value of mem_cgroup_scan_tasks(). Make the
return value void.

Link: https://lkml.kernel.org/r/20230616063030.977586-1-zhangpeng362@huawei.com


Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nanyong Sun <sunnanyong@huawei.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent aa13779b

include/linux/memcontrol.h

+3 −4
Original line number Diff line number Diff line
@@ -820,8 +820,8 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *, 
				   struct mem_cgroup *,

				   struct mem_cgroup_reclaim_cookie *);

void mem_cgroup_iter_break(struct mem_cgroup *, struct mem_cgroup *);

int mem_cgroup_scan_tasks(struct mem_cgroup *,

			  int (*)(struct task_struct *, void *), void *);

void mem_cgroup_scan_tasks(struct mem_cgroup *memcg,

			   int (*)(struct task_struct *, void *), void *arg);



static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg)

{
@@ -1364,10 +1364,9 @@ static inline void mem_cgroup_iter_break(struct mem_cgroup *root, 
{

}



static inline int mem_cgroup_scan_tasks(struct mem_cgroup *memcg,

static inline void mem_cgroup_scan_tasks(struct mem_cgroup *memcg,

		int (*fn)(struct task_struct *, void *), void *arg)

{

	return 0;

}



static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg)

mm/memcontrol.c

+4 −5
Original line number Diff line number Diff line
@@ -1259,12 +1259,12 @@ static void invalidate_reclaim_iterators(struct mem_cgroup *dead_memcg) 
 *

 * This function iterates over tasks attached to @memcg or to any of its

 * descendants and calls @fn for each task. If @fn returns a non-zero

 * value, the function breaks the iteration loop and returns the value.

 * Otherwise, it will iterate over all tasks and return 0.

 * value, the function breaks the iteration loop. Otherwise, it will iterate

 * over all tasks and return 0.

 *

 * This function must not be called for the root memory cgroup.

 */

int mem_cgroup_scan_tasks(struct mem_cgroup *memcg,

void mem_cgroup_scan_tasks(struct mem_cgroup *memcg,

			   int (*fn)(struct task_struct *, void *), void *arg)

{

	struct mem_cgroup *iter;
@@ -1285,7 +1285,6 @@ int mem_cgroup_scan_tasks(struct mem_cgroup *memcg, 
			break;

		}

	}

	return ret;

}



#ifdef CONFIG_DEBUG_VM