diff options
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index c6877fe9a831..1ece8e20fdb5 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1472,7 +1472,6 @@ static int cgroup_get_rootdir(struct super_block *sb) | |||
1472 | 1472 | ||
1473 | struct inode *inode = | 1473 | struct inode *inode = |
1474 | cgroup_new_inode(S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR, sb); | 1474 | cgroup_new_inode(S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR, sb); |
1475 | struct dentry *dentry; | ||
1476 | 1475 | ||
1477 | if (!inode) | 1476 | if (!inode) |
1478 | return -ENOMEM; | 1477 | return -ENOMEM; |
@@ -1481,12 +1480,9 @@ static int cgroup_get_rootdir(struct super_block *sb) | |||
1481 | inode->i_op = &cgroup_dir_inode_operations; | 1480 | inode->i_op = &cgroup_dir_inode_operations; |
1482 | /* directories start off with i_nlink == 2 (for "." entry) */ | 1481 | /* directories start off with i_nlink == 2 (for "." entry) */ |
1483 | inc_nlink(inode); | 1482 | inc_nlink(inode); |
1484 | dentry = d_alloc_root(inode); | 1483 | sb->s_root = d_make_root(inode); |
1485 | if (!dentry) { | 1484 | if (!sb->s_root) |
1486 | iput(inode); | ||
1487 | return -ENOMEM; | 1485 | return -ENOMEM; |
1488 | } | ||
1489 | sb->s_root = dentry; | ||
1490 | /* for everything else we want ->d_op set */ | 1486 | /* for everything else we want ->d_op set */ |
1491 | sb->s_d_op = &cgroup_dops; | 1487 | sb->s_d_op = &cgroup_dops; |
1492 | return 0; | 1488 | return 0; |