1 files changed, 6 insertions, 3 deletions

diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 28d4e6ab6634..b341492542ca 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -2908,9 +2908,10 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
                 ntfs_error(sb, "Failed to load system files.");
                 goto unl_upcase_iput_tmp_ino_err_out_now;
         }
-        if ((sb->s_root = d_alloc_root(vol->root_ino))) {
-                /* We grab a reference, simulating an ntfs_iget(). */
-                ihold(vol->root_ino);
+
+        /* We grab a reference, simulating an ntfs_iget(). */
+        ihold(vol->root_ino);
+        if ((sb->s_root = d_make_root(vol->root_ino))) {
                 ntfs_debug("Exiting, status successful.");
                 /* Release the default upcase if it has no users. */
                 mutex_lock(&ntfs_lock);
@@ -3158,6 +3159,8 @@ static int __init init_ntfs_fs(void)
         }
         printk(KERN_CRIT "NTFS: Failed to register NTFS filesystem driver!\n");
 
+        /* Unregister the ntfs sysctls. */
+        ntfs_sysctl(0);
 sysctl_err_out:
         kmem_cache_destroy(ntfs_big_inode_cache);
 big_inode_err_out: