1 files changed, 10 insertions, 7 deletions

diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index f907611cca73..b341492542ca 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -2473,7 +2473,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)
                         nr_free -= PAGE_CACHE_SIZE * 8;
                         continue;
                 }
-                kaddr = kmap_atomic(page, KM_USER0);
+                kaddr = kmap_atomic(page);
                 /*
                  * Subtract the number of set bits. If this
                  * is the last page and it is partial we don't really care as
@@ -2483,7 +2483,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)
                  */
                 nr_free -= bitmap_weight(kaddr,
                                         PAGE_CACHE_SIZE * BITS_PER_BYTE);
-                kunmap_atomic(kaddr, KM_USER0);
+                kunmap_atomic(kaddr);
                 page_cache_release(page);
         }
         ntfs_debug("Finished reading $Bitmap, last index = 0x%lx.", index - 1);
@@ -2544,7 +2544,7 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,
                         nr_free -= PAGE_CACHE_SIZE * 8;
                         continue;
                 }
-                kaddr = kmap_atomic(page, KM_USER0);
+                kaddr = kmap_atomic(page);
                 /*
                  * Subtract the number of set bits. If this
                  * is the last page and it is partial we don't really care as
@@ -2554,7 +2554,7 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,
                  */
                 nr_free -= bitmap_weight(kaddr,
                                         PAGE_CACHE_SIZE * BITS_PER_BYTE);
-                kunmap_atomic(kaddr, KM_USER0);
+                kunmap_atomic(kaddr);
                 page_cache_release(page);
         }
         ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx.",
@@ -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: