Commit 48fde701 authored by Al Viro's avatar Al Viro

switch open-coded instances of d_make_root() to new helper

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6b4231e2
...@@ -757,9 +757,9 @@ spufs_create_root(struct super_block *sb, void *data) ...@@ -757,9 +757,9 @@ spufs_create_root(struct super_block *sb, void *data)
goto out_iput; goto out_iput;
ret = -ENOMEM; ret = -ENOMEM;
sb->s_root = d_alloc_root(inode); sb->s_root = d_make_root(inode);
if (!sb->s_root) if (!sb->s_root)
goto out_iput; goto out;
return 0; return 0;
out_iput: out_iput:
......
...@@ -293,11 +293,9 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -293,11 +293,9 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
return -ENOMEM; return -ENOMEM;
root_inode->i_op = &simple_dir_inode_operations; root_inode->i_op = &simple_dir_inode_operations;
root_inode->i_fop = &simple_dir_operations; root_inode->i_fop = &simple_dir_operations;
sb->s_root = root_dentry = d_alloc_root(root_inode); sb->s_root = root_dentry = d_make_root(root_inode);
if (!root_dentry) { if (!root_dentry)
iput(root_inode);
return -ENOMEM; return -ENOMEM;
}
if (MACHINE_IS_VM) if (MACHINE_IS_VM)
rc = hypfs_vm_create_files(sb, root_dentry); rc = hypfs_vm_create_files(sb, root_dentry);
else else
......
...@@ -129,11 +129,9 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) ...@@ -129,11 +129,9 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
root->i_op = &simple_dir_inode_operations; root->i_op = &simple_dir_inode_operations;
root->i_fop = ibmasmfs_dir_ops; root->i_fop = ibmasmfs_dir_ops;
root_dentry = d_alloc_root(root); root_dentry = d_make_root(root);
if (!root_dentry) { if (!root_dentry)
iput(root);
return -ENOMEM; return -ENOMEM;
}
sb->s_root = root_dentry; sb->s_root = root_dentry;
ibmasmfs_create_files(sb, root_dentry); ibmasmfs_create_files(sb, root_dentry);
......
...@@ -251,11 +251,9 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -251,11 +251,9 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
return -ENOMEM; return -ENOMEM;
root_inode->i_op = &simple_dir_inode_operations; root_inode->i_op = &simple_dir_inode_operations;
root_inode->i_fop = &simple_dir_operations; root_inode->i_fop = &simple_dir_operations;
root_dentry = d_alloc_root(root_inode); root_dentry = d_make_root(root_inode);
if (!root_dentry) { if (!root_dentry)
iput(root_inode);
return -ENOMEM; return -ENOMEM;
}
sb->s_root = root_dentry; sb->s_root = root_dentry;
......
...@@ -462,16 +462,9 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -462,16 +462,9 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_op = &usbfs_ops; sb->s_op = &usbfs_ops;
sb->s_time_gran = 1; sb->s_time_gran = 1;
inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0); inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
root = d_make_root(inode);
if (!inode) {
dbg("%s: could not get inode!",__func__);
return -ENOMEM;
}
root = d_alloc_root(inode);
if (!root) { if (!root) {
dbg("%s: could not get root dentry!",__func__); dbg("%s: could not get root dentry!",__func__);
iput(inode);
return -ENOMEM; return -ENOMEM;
} }
sb->s_root = root; sb->s_root = root;
......
...@@ -1063,13 +1063,9 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent) ...@@ -1063,13 +1063,9 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
&simple_dir_operations, &simple_dir_operations,
&simple_dir_inode_operations, &simple_dir_inode_operations,
&data->perms); &data->perms);
if (unlikely(!inode)) sb->s_root = d_make_root(inode);
if (unlikely(!sb->s_root))
goto Enomem; goto Enomem;
sb->s_root = d_alloc_root(inode);
if (unlikely(!sb->s_root)) {
iput(inode);
goto Enomem;
}
/* EP0 file */ /* EP0 file */
if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs, if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs,
......
...@@ -2059,10 +2059,8 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent) ...@@ -2059,10 +2059,8 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
if (!inode) if (!inode)
goto Enomem; goto Enomem;
inode->i_op = &simple_dir_inode_operations; inode->i_op = &simple_dir_inode_operations;
if (!(sb->s_root = d_alloc_root (inode))) { if (!(sb->s_root = d_make_root (inode)))
iput(inode);
goto Enomem; goto Enomem;
}
/* the ep0 file is named after the controller we expect; /* the ep0 file is named after the controller we expect;
* user mode code can use it for sanity checks, like we do. * user mode code can use it for sanity checks, like we do.
......
...@@ -155,9 +155,8 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, ...@@ -155,9 +155,8 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
goto release_sb; goto release_sb;
} }
root = d_alloc_root(inode); root = d_make_root(inode);
if (!root) { if (!root) {
iput(inode);
retval = -ENOMEM; retval = -ENOMEM;
goto release_sb; goto release_sb;
} }
......
...@@ -483,10 +483,9 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -483,10 +483,9 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_d_op = &adfs_dentry_operations; sb->s_d_op = &adfs_dentry_operations;
root = adfs_iget(sb, &root_obj); root = adfs_iget(sb, &root_obj);
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
int i; int i;
iput(root);
for (i = 0; i < asb->s_map_size; i++) for (i = 0; i < asb->s_map_size; i++)
brelse(asb->s_map[i].dm_bh); brelse(asb->s_map[i].dm_bh);
kfree(asb->s_map); kfree(asb->s_map);
......
...@@ -473,7 +473,7 @@ got_root: ...@@ -473,7 +473,7 @@ got_root:
root_inode = affs_iget(sb, root_block); root_inode = affs_iget(sb, root_block);
if (IS_ERR(root_inode)) { if (IS_ERR(root_inode)) {
ret = PTR_ERR(root_inode); ret = PTR_ERR(root_inode);
goto out_error_noinode; goto out_error;
} }
if (AFFS_SB(sb)->s_flags & SF_INTL) if (AFFS_SB(sb)->s_flags & SF_INTL)
...@@ -481,7 +481,7 @@ got_root: ...@@ -481,7 +481,7 @@ got_root:
else else
sb->s_d_op = &affs_dentry_operations; sb->s_d_op = &affs_dentry_operations;
sb->s_root = d_alloc_root(root_inode); sb->s_root = d_make_root(root_inode);
if (!sb->s_root) { if (!sb->s_root) {
printk(KERN_ERR "AFFS: Get root inode failed\n"); printk(KERN_ERR "AFFS: Get root inode failed\n");
goto out_error; goto out_error;
...@@ -494,9 +494,6 @@ got_root: ...@@ -494,9 +494,6 @@ got_root:
* Begin the cascaded cleanup ... * Begin the cascaded cleanup ...
*/ */
out_error: out_error:
if (root_inode)
iput(root_inode);
out_error_noinode:
kfree(sbi->s_bitmap); kfree(sbi->s_bitmap);
affs_brelse(root_bh); affs_brelse(root_bh);
kfree(sbi->s_prefix); kfree(sbi->s_prefix);
......
...@@ -301,7 +301,6 @@ static int afs_fill_super(struct super_block *sb, ...@@ -301,7 +301,6 @@ static int afs_fill_super(struct super_block *sb,
{ {
struct afs_super_info *as = sb->s_fs_info; struct afs_super_info *as = sb->s_fs_info;
struct afs_fid fid; struct afs_fid fid;
struct dentry *root = NULL;
struct inode *inode = NULL; struct inode *inode = NULL;
int ret; int ret;
...@@ -327,18 +326,16 @@ static int afs_fill_super(struct super_block *sb, ...@@ -327,18 +326,16 @@ static int afs_fill_super(struct super_block *sb,
set_bit(AFS_VNODE_AUTOCELL, &AFS_FS_I(inode)->flags); set_bit(AFS_VNODE_AUTOCELL, &AFS_FS_I(inode)->flags);
ret = -ENOMEM; ret = -ENOMEM;
root = d_alloc_root(inode); sb->s_root = d_make_root(inode);
if (!root) if (!sb->s_root)
goto error; goto error;
sb->s_d_op = &afs_fs_dentry_operations; sb->s_d_op = &afs_fs_dentry_operations;
sb->s_root = root;
_leave(" = 0"); _leave(" = 0");
return 0; return 0;
error: error:
iput(inode);
_leave(" = %d", ret); _leave(" = %d", ret);
return ret; return ret;
} }
......
...@@ -247,12 +247,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) ...@@ -247,12 +247,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
if (!ino) if (!ino)
goto fail_free; goto fail_free;
root_inode = autofs4_get_inode(s, S_IFDIR | 0755); root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
if (!root_inode) root = d_make_root(root_inode);
goto fail_ino;
root = d_alloc_root(root_inode);
if (!root) if (!root)
goto fail_iput; goto fail_ino;
pipe = NULL; pipe = NULL;
root->d_fsdata = ino; root->d_fsdata = ino;
...@@ -317,9 +314,6 @@ fail_fput: ...@@ -317,9 +314,6 @@ fail_fput:
fail_dput: fail_dput:
dput(root); dput(root);
goto fail_free; goto fail_free;
fail_iput:
printk("autofs: get root dentry failed\n");
iput(root_inode);
fail_ino: fail_ino:
kfree(ino); kfree(ino);
fail_free: fail_free:
......
...@@ -852,9 +852,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -852,9 +852,8 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto unacquire_priv_sbp; goto unacquire_priv_sbp;
} }
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
iput(root);
befs_error(sb, "get root inode failed"); befs_error(sb, "get root inode failed");
goto unacquire_priv_sbp; goto unacquire_priv_sbp;
} }
......
...@@ -367,9 +367,8 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent) ...@@ -367,9 +367,8 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
ret = PTR_ERR(inode); ret = PTR_ERR(inode);
goto out2; goto out2;
} }
s->s_root = d_alloc_root(inode); s->s_root = d_make_root(inode);
if (!s->s_root) { if (!s->s_root) {
iput(inode);
ret = -ENOMEM; ret = -ENOMEM;
goto out2; goto out2;
} }
......
...@@ -629,7 +629,6 @@ static int btrfs_fill_super(struct super_block *sb, ...@@ -629,7 +629,6 @@ static int btrfs_fill_super(struct super_block *sb,
void *data, int silent) void *data, int silent)
{ {
struct inode *inode; struct inode *inode;
struct dentry *root_dentry;
struct btrfs_fs_info *fs_info = btrfs_sb(sb); struct btrfs_fs_info *fs_info = btrfs_sb(sb);
struct btrfs_key key; struct btrfs_key key;
int err; int err;
...@@ -660,15 +659,12 @@ static int btrfs_fill_super(struct super_block *sb, ...@@ -660,15 +659,12 @@ static int btrfs_fill_super(struct super_block *sb,
goto fail_close; goto fail_close;
} }
root_dentry = d_alloc_root(inode); sb->s_root = d_make_root(inode);
if (!root_dentry) { if (!sb->s_root) {
iput(inode);
err = -ENOMEM; err = -ENOMEM;
goto fail_close; goto fail_close;
} }
sb->s_root = root_dentry;
save_mount_options(sb, data); save_mount_options(sb, data);
cleancache_init_fs(sb); cleancache_init_fs(sb);
sb->s_flags |= MS_ACTIVE; sb->s_flags |= MS_ACTIVE;
......
...@@ -655,9 +655,8 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc, ...@@ -655,9 +655,8 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc,
dout("open_root_inode success\n"); dout("open_root_inode success\n");
if (ceph_ino(inode) == CEPH_INO_ROOT && if (ceph_ino(inode) == CEPH_INO_ROOT &&
fsc->sb->s_root == NULL) { fsc->sb->s_root == NULL) {
root = d_alloc_root(inode); root = d_make_root(inode);
if (!root) { if (!root) {
iput(inode);
root = ERR_PTR(-ENOMEM); root = ERR_PTR(-ENOMEM);
goto out; goto out;
} }
......
...@@ -122,11 +122,9 @@ cifs_read_super(struct super_block *sb) ...@@ -122,11 +122,9 @@ cifs_read_super(struct super_block *sb)
goto out_no_root; goto out_no_root;
} }
sb->s_root = d_alloc_root(inode); sb->s_root = d_make_root(inode);
if (!sb->s_root) { if (!sb->s_root) {
rc = -ENOMEM; rc = -ENOMEM;
iput(inode);
goto out_no_root; goto out_no_root;
} }
......
...@@ -213,9 +213,8 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) ...@@ -213,9 +213,8 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
printk("coda_read_super: rootinode is %ld dev %s\n", printk("coda_read_super: rootinode is %ld dev %s\n",
root->i_ino, root->i_sb->s_id); root->i_ino, root->i_sb->s_id);
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
iput(root);
error = -EINVAL; error = -EINVAL;
goto error; goto error;
} }
......
...@@ -91,10 +91,9 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -91,10 +91,9 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
return -ENOMEM; return -ENOMEM;
} }
root = d_alloc_root(inode); root = d_make_root(inode);
if (!root) { if (!root) {
pr_debug("%s: could not get root dentry!\n",__func__); pr_debug("%s: could not get root dentry!\n",__func__);
iput(inode);
return -ENOMEM; return -ENOMEM;
} }
config_group_init(&configfs_root_group); config_group_init(&configfs_root_group);
......
...@@ -318,11 +318,9 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -318,11 +318,9 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
root = get_cramfs_inode(sb, &super.root, 0); root = get_cramfs_inode(sb, &super.root, 0);
if (IS_ERR(root)) if (IS_ERR(root))
goto out; goto out;
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root)
iput(root);
goto out; goto out;
}
return 0; return 0;
out: out:
kfree(sbi); kfree(sbi);
......
...@@ -309,12 +309,11 @@ devpts_fill_super(struct super_block *s, void *data, int silent) ...@@ -309,12 +309,11 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
inode->i_fop = &simple_dir_operations; inode->i_fop = &simple_dir_operations;
set_nlink(inode, 2); set_nlink(inode, 2);
s->s_root = d_alloc_root(inode); s->s_root = d_make_root(inode);
if (s->s_root) if (s->s_root)
return 0; return 0;
printk(KERN_ERR "devpts: get root dentry failed\n"); printk(KERN_ERR "devpts: get root dentry failed\n");
iput(inode);
fail: fail:
return -ENOMEM; return -ENOMEM;
......
...@@ -550,9 +550,8 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags ...@@ -550,9 +550,8 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
if (IS_ERR(inode)) if (IS_ERR(inode))
goto out_free; goto out_free;
s->s_root = d_alloc_root(inode); s->s_root = d_make_root(inode);
if (!s->s_root) { if (!s->s_root) {
iput(inode);
rc = -ENOMEM; rc = -ENOMEM;
goto out_free; goto out_free;
} }
......
...@@ -317,10 +317,9 @@ static int efs_fill_super(struct super_block *s, void *d, int silent) ...@@ -317,10 +317,9 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
goto out_no_fs; goto out_no_fs;
} }
s->s_root = d_alloc_root(root); s->s_root = d_make_root(root);
if (!(s->s_root)) { if (!(s->s_root)) {
printk(KERN_ERR "EFS: get root dentry failed\n"); printk(KERN_ERR "EFS: get root dentry failed\n");
iput(root);
ret = -ENOMEM; ret = -ENOMEM;
goto out_no_fs; goto out_no_fs;
} }
......
...@@ -819,9 +819,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -819,9 +819,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto free_sbi; goto free_sbi;
} }
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
iput(root);
EXOFS_ERR("ERROR: get root inode failed\n"); EXOFS_ERR("ERROR: get root inode failed\n");
ret = -ENOMEM; ret = -ENOMEM;
goto free_sbi; goto free_sbi;
......
...@@ -1088,9 +1088,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1088,9 +1088,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
goto failed_mount3; goto failed_mount3;
} }
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
iput(root);
ext2_msg(sb, KERN_ERR, "error: get root inode failed"); ext2_msg(sb, KERN_ERR, "error: get root inode failed");
ret = -ENOMEM; ret = -ENOMEM;
goto failed_mount3; goto failed_mount3;
......
...@@ -2046,10 +2046,9 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) ...@@ -2046,10 +2046,9 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
ext3_msg(sb, KERN_ERR, "error: corrupt root inode, run e2fsck"); ext3_msg(sb, KERN_ERR, "error: corrupt root inode, run e2fsck");
goto failed_mount3; goto failed_mount3;
} }
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
ext3_msg(sb, KERN_ERR, "error: get root dentry failed"); ext3_msg(sb, KERN_ERR, "error: get root dentry failed");
iput(root);
ret = -ENOMEM; ret = -ENOMEM;
goto failed_mount3; goto failed_mount3;
} }
......
...@@ -3735,9 +3735,8 @@ no_journal: ...@@ -3735,9 +3735,8 @@ no_journal:
iput(root); iput(root);
goto failed_mount4; goto failed_mount4;
} }
sb->s_root = d_alloc_root(root); sb->s_root = d_make_root(root);
if (!sb->s_root) { if (!sb->s_root) {
iput(root);
ext4_msg(sb, KERN_ERR, "get root dentry failed"); ext4_msg(sb, KERN_ERR, "get root dentry failed");
ret = -ENOMEM; ret = -ENOMEM;
goto failed_mount4; goto failed_mount4;
......
...@@ -224,9 +224,8 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent) ...@@ -224,9 +224,8 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)
ret = PTR_ERR(root); ret = PTR_ERR(root);
goto out; goto out;
} }
sbp->s_root = d_alloc_root(root); sbp->s_root = d_make_root(root);
if (!sbp->s_root) { if (!sbp->s_root) {
iput(root);
printk(KERN_WARNING "vxfs: unable to get root dentry.\n"); printk(KERN_WARNING "vxfs: unable to get root dentry.\n");
goto out_free_ilist; goto out_free_ilist;
} }
......
...@@ -988,14 +988,9 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) ...@@ -988,14 +988,9 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
err = -ENOMEM; err = -ENOMEM;
root = fuse_get_root_inode(sb, d.rootmode); root = fuse_get_root_inode(sb, d.rootmode);
if (!root) root_dentry = d_make_root(root);
if (!root_dentry)
goto err_put_conn; goto err_put_conn;
root_dentry = d_alloc_root(root);
if (!root_dentry) {
iput(root);
goto err_put_conn;
}
/* only now - we want root dentry with NULL ->d_op */ /* only now - we want root dentry with NULL ->d_op */
sb->s_d_op = &fuse_dentry_operations; sb->s_d_op = &fuse_dentry_operations;
......
...@@ -431,10 +431,9 @@ static int gfs2_lookup_root(struct super_block *sb, struct dentry **dptr, ...@@ -431,10 +431,9 @@ static int gfs2_lookup_root(struct super_block *sb, struct dentry **dptr,
fs_err(sdp, "can't read in %s inode: %ld\n", name, PTR_ERR(inode)); fs_err(sdp, "can't read in %s inode: %ld\n", name, PTR_ERR(inode));
return PTR_ERR(inode); return PTR_ERR(inode);
} }
dentry = d_alloc_root(inode); dentry = d_make_root(inode);
if (!dentry) { if (!dentry) {
fs_err(sdp, "can't alloc %s dentry\n", name); fs_err(sdp, "can't alloc %s dentry\n", name);
iput(inode);
return -ENOMEM; return -ENOMEM;
} }
*dptr = dentry; *dptr = dentry;
......
...@@ -430,15 +430,13 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -430,15 +430,13 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_d_op = &hfs_dentry_operations; sb->s_d_op = &hfs_dentry_operations;
res = -ENOMEM; res = -ENOMEM;
sb->s_root = d_alloc_root(root_inode); sb->s_root = d_make_root(root_inode);
if (!sb->s_root) if (!sb->s_root)
goto bail_iput; goto bail_no_root;
/* everything's okay */ /* everything's okay */
return 0; return 0;
bail_iput:
iput(root_inode);
bail_no_root: bail_no_root:
printk(KERN_ERR "hfs: get root inode failed.\n"); printk(KERN_ERR "hfs: get root inode failed.\n");
bail: bail:
......
...@@ -966,9 +966,9 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) ...@@ -966,9 +966,9 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
} }
err = -ENOMEM; err = -ENOMEM;
sb->s_root = d_alloc_root(root_inode); sb->s_root = d_make_root(root_inode);
if (sb->s_root == NULL) if (sb->s_root == NULL)
goto out_put; goto out;
return 0; return 0;
......
...@@ -625,11 +625,9 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -625,11 +625,9 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
hpfs_init_inode(root); hpfs_init_inode(root);
hpfs_read_inode(root); hpfs_read_inode(root);
unlock_new_inode(root); unlock_new_inode(root);
s->s_root = d_alloc_root(root); s->s_root = d_make_root(root);
if (!s->s_root) { if (!s->s_root)