summaryrefslogtreecommitdiffstats
path: root/fs/hugetlbfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/hugetlbfs')
-rw-r--r--fs/hugetlbfs/inode.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 1e85a7ac0217..81932fa1861a 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -831,8 +831,6 @@ bad_val:
static int
hugetlbfs_fill_super(struct super_block *sb, void *data, int silent)
{
- struct inode * inode;
- struct dentry * root;
int ret;
struct hugetlbfs_config config;
struct hugetlbfs_sb_info *sbinfo;
@@ -865,16 +863,9 @@ hugetlbfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_magic = HUGETLBFS_MAGIC;
sb->s_op = &hugetlbfs_ops;
sb->s_time_gran = 1;
- inode = hugetlbfs_get_root(sb, &config);
- if (!inode)
- goto out_free;
-
- root = d_alloc_root(inode);
- if (!root) {
- iput(inode);
+ sb->s_root = d_make_root(hugetlbfs_get_root(sb, &config));
+ if (!sb->s_root)
goto out_free;
- }
- sb->s_root = root;
return 0;
out_free:
kfree(sbinfo);
3be4266d3488cbbaddf7fcc661f4473db341e46'>Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2015-09-271-33/+81 |\ \ \ \ | * | | | perf: Fix races in computing the header sizesPeter Zijlstra2015-09-181-6/+9 | * | | | perf: Fix u16 overflowsPeter Zijlstra2015-09-181-10/+40 | * | | | perf: Restructure perf syscall point of no returnPeter Zijlstra2015-09-181-17/+32 * | | | | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2015-09-271-3/+11 |\ \ \ \ \ | * | | | | sched: Fix crash trying to dequeue/enqueue the idle threadPeter Zijlstra2015-09-181-3/+11 | |/ / / / * | | | | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2015-09-271-5/+5 |\ \ \ \ \ | |_|/ / / |/| | | | | * | | | locking/lockdep: Fix hlock->pin_count reset on lock stack rebuildsPeter Zijlstra2015-09-231-5/+5 * | | | | userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_...Andrea Arcangeli2015-09-231-4/+3Star |/ / / / * | | | Merge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2015-09-22