From: Tejun Heo <tj@kernel.org>
Date: Sat, 8 Feb 2014 15:37:14 +0000 (-0500)
Subject: Merge branch 'for-3.14-fixes' into for-3.15
X-Git-Tag: next-20140306~19^2~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a698a4aba26dd58e8409d325a9a9db22f7cd2db;p=karo-tx-linux.git

Merge branch 'for-3.14-fixes' into for-3.15

Pending kernfs conversion depends on fixes in for-3.14-fixes.  Pull it
into for-3.15.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

1a698a4aba26dd58e8409d325a9a9db22f7cd2db
diff --cc kernel/cgroup.c
index 0e7829078049,3edf7163b84f..f5bbe5885364
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -1493,11 -1564,12 +1493,11 @@@ static struct dentry *cgroup_mount(stru
  
  		mutex_lock(&inode->i_mutex);
  		mutex_lock(&cgroup_mutex);
 -		mutex_lock(&cgroup_root_mutex);
  
- 		root_cgrp->id = idr_alloc(&root->cgroup_idr, root_cgrp,
- 					   0, 1, GFP_KERNEL);
- 		if (root_cgrp->id < 0)
+ 		ret = idr_alloc(&root->cgroup_idr, root_cgrp, 0, 1, GFP_KERNEL);
+ 		if (ret < 0)
  			goto unlock_drop;
+ 		root_cgrp->id = ret;
  
  		/* Check for name clashes with existing mounts */
  		ret = -EBUSY;