---

yaml --- r: 233916 b: refs/heads/master c: b75f38d h: refs/heads/master v: v3
git-mirror · Mar 5, 2011 · d0f32a3 · d0f32a3
1 parent fb88470
commit d0f32a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ec38a0359e227c01080dcd670a0368c61ccd9ce
+refs/heads/master: b75f38d659e6fc747eda64cb72f3920e29dd44a4
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
@@ -1575,8 +1575,10 @@ static int cpuset_write_resmask(struct cgroup *cgrp, struct cftype *cft,
 		return -ENODEV;
 
 	trialcs = alloc_trial_cpuset(cs);
-	if (!trialcs)
-		return -ENOMEM;
+	if (!trialcs) {
+		retval = -ENOMEM;
+		goto out;
+	}
 
 	switch (cft->private) {
 	case FILE_CPULIST:
@@ -1591,6 +1593,7 @@ static int cpuset_write_resmask(struct cgroup *cgrp, struct cftype *cft,
 	}
 
 	free_trial_cpuset(trialcs);
+out:
 	cgroup_unlock();
 	return retval;
 }