[no subject]

From: Tejun Heo
Date: Sun Aug 28 2022 - 23:54:15 EST


fa7e439cf90b ("cgroup: Homogenize cgroup_get_from_id() return value") broken
build when CONFIG_SHRINKER_DEBUG by trying to return an errno from
mem_cgroup_get_from_ino() which returns struct mem_cgroup *. Fix by using
ERR_CAST() instead.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Michal Koutn�utny@xxxxxxxx>f
Fixes: fa7e439cf90b ("cgroup: Homogenize cgroup_get_from_id() return value")
---
Sorry about that. Applied this fix to cgroup/for-6.1.

Thanks.

mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 86f5ca8c6fa6..e9fc364d5e96 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5111,7 +5111,7 @@ struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino)

cgrp = cgroup_get_from_id(ino);
if (IS_ERR(cgrp))
- return PTR_ERR(cgrp);
+ return ERR_CAST(cgrp);

css = cgroup_get_e_css(cgrp, &memory_cgrp_subsys);
if (css)
--
2.37.2