2 files changed, 7 insertions, 8 deletions

diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 1b6e21dda286..bea5d1b9954b 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -558,9 +558,6 @@ static int logfs_link(struct dentry *old_dentry, struct inode *dir,
 {
         struct inode *inode = old_dentry->d_inode;
 
-        if (inode->i_nlink >= LOGFS_LINK_MAX)
-                return -EMLINK;
-
         inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
         ihold(inode);
         inc_nlink(inode);
diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index c9ee7f5d1caf..97bca623d893 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -315,11 +315,9 @@ static int logfs_get_sb_final(struct super_block *sb)
         if (IS_ERR(rootdir))
                 goto fail;
 
-        sb->s_root = d_alloc_root(rootdir);
-        if (!sb->s_root) {
-                iput(rootdir);
+        sb->s_root = d_make_root(rootdir);
+        if (!sb->s_root)
                 goto fail;
-        }
 
         /* at that point we know that ->put_super() will be called */
         super->s_erase_page = alloc_pages(GFP_KERNEL, 0);
@@ -542,6 +540,7 @@ static struct dentry *logfs_get_sb_device(struct logfs_super *super,
          * the filesystem incompatible with 32bit systems.
          */
         sb->s_maxbytes  = (1ull << 43) - 1;
+        sb->s_max_links = LOGFS_LINK_MAX;
         sb->s_op        = &logfs_super_operations;
         sb->s_flags     = flags | MS_NOATIME;
 
@@ -627,7 +626,10 @@ static int __init logfs_init(void)
         if (ret)
                 goto out2;
 
-        return register_filesystem(&logfs_fs_type);
+        ret = register_filesystem(&logfs_fs_type);
+        if (!ret)
+                return 0;
+        logfs_destroy_inode_cache();
 out2:
         logfs_compr_exit();
 out1: