cgroup: fix error return value of cgroup_addrm_files()
authorTejun Heo <tj@kernel.org>
Tue, 23 Feb 2016 03:25:45 +0000 (22:25 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 23 Feb 2016 03:25:45 +0000 (22:25 -0500)
cgroup_addrm_files() incorrectly returned 0 after add failure.  Fix
it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
kernel/cgroup.c

index 7ad61915967fc00c2875c5d6184c646a9ae32405..68b032df77f55e76bb980c5af3adfc743af32574 100644 (file)
@@ -3369,7 +3369,7 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,
                              bool is_add)
 {
        struct cftype *cft, *cft_end = NULL;
-       int ret;
+       int ret = 0;
 
        lockdep_assert_held(&cgroup_mutex);
 
@@ -3398,7 +3398,7 @@ restart:
                        cgroup_rm_file(cgrp, cft);
                }
        }
-       return 0;
+       return ret;
 }
 
 static int cgroup_apply_cftypes(struct cftype *cfts, bool is_add)