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>

diff --cc kernel/cgroup.c
index 0e782907804994e97725dbfbcc1db3a0ee1495f1,3edf7163b84fb08eb1cf85a5388706c0d7f0ca41..f5bbe58853644a0e5d30991a71347d48839ee208
--- 1/kernel/cgroup.c
--- 2/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;