1 files changed, 2 insertions, 2 deletions

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 08e3d4f9df18..1099a76cee59 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -917,9 +917,8 @@ static int nilfs_get_root_dentry(struct super_block *sb,
         if (root->cno == NILFS_CPTREE_CURRENT_CNO) {
                 dentry = d_find_alias(inode);
                 if (!dentry) {
-                        dentry = d_alloc_root(inode);
+                        dentry = d_make_root(inode);
                         if (!dentry) {
-                                iput(inode);
                                 ret = -ENOMEM;
                                 goto failed_dentry;
                         }
@@ -1059,6 +1058,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_export_op = &nilfs_export_ops;
         sb->s_root = NULL;
         sb->s_time_gran = 1;
+        sb->s_max_links = NILFS_LINK_MAX;
 
         bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info;
         sb->s_bdi = bdi ? : &default_backing_dev_info;