diff options
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 64cf8d07393e..4aec5995867e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -988,14 +988,9 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) | |||
988 | 988 | ||
989 | err = -ENOMEM; | 989 | err = -ENOMEM; |
990 | root = fuse_get_root_inode(sb, d.rootmode); | 990 | root = fuse_get_root_inode(sb, d.rootmode); |
991 | if (!root) | 991 | root_dentry = d_make_root(root); |
992 | if (!root_dentry) | ||
992 | goto err_put_conn; | 993 | goto err_put_conn; |
993 | |||
994 | root_dentry = d_alloc_root(root); | ||
995 | if (!root_dentry) { | ||
996 | iput(root); | ||
997 | goto err_put_conn; | ||
998 | } | ||
999 | /* only now - we want root dentry with NULL ->d_op */ | 994 | /* only now - we want root dentry with NULL ->d_op */ |
1000 | sb->s_d_op = &fuse_dentry_operations; | 995 | sb->s_d_op = &fuse_dentry_operations; |
1001 | 996 | ||