Messages in this thread Patch in this message | | | Date | Fri, 11 Mar 2011 12:40:02 -0800 | From | Greg KH <> | Subject | [01/17] cpuset: add a missing unlock in cpuset_write_resmask() |
| |
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Li Zefan <lizf@cn.fujitsu.com>
commit b75f38d659e6fc747eda64cb72f3920e29dd44a4 upstream.
Don't forget to release cgroup_mutex if alloc_trial_cpuset() fails.
[akpm@linux-foundation.org: avoid multiple return points] Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Paul Menage <menage@google.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- kernel/cpuset.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
--- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1514,8 +1514,10 @@ static int cpuset_write_resmask(struct c return -ENODEV; trialcs = alloc_trial_cpuset(cs); - if (!trialcs) - return -ENOMEM; + if (!trialcs) { + retval = -ENOMEM; + goto out; + } switch (cft->private) { case FILE_CPULIST: @@ -1530,6 +1532,7 @@ static int cpuset_write_resmask(struct c } free_trial_cpuset(trialcs); +out: cgroup_unlock(); return retval; }
| |