5 files changed, 12 insertions, 40 deletions

diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index d1e2c6f9f05e..85c36b8ca452 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -1149,8 +1149,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
          * Allocate a buffer to store the current name being processed
          * converted to format determined by current NLS.
          */
-        name = (u8*)kmalloc(NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1,
-                        GFP_NOFS);
+        name = kmalloc(NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1, GFP_NOFS);
         if (unlikely(!name)) {
                 err = -ENOMEM;
                 goto err_out;
@@ -1191,7 +1190,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
          * map the mft record without deadlocking.
          */
         rc = le32_to_cpu(ctx->attr->data.resident.value_length);
-        ir = (INDEX_ROOT*)kmalloc(rc, GFP_NOFS);
+        ir = kmalloc(rc, GFP_NOFS);
         if (unlikely(!ir)) {
                 err = -ENOMEM;
                 goto err_out;
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index d313f356e66a..933dbd89c2a4 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -137,7 +137,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)
 
                 BUG_ON(!na->name);
                 i = na->name_len * sizeof(ntfschar);
-                ni->name = (ntfschar*)kmalloc(i + sizeof(ntfschar), GFP_ATOMIC);
+                ni->name = kmalloc(i + sizeof(ntfschar), GFP_ATOMIC);
                 if (!ni->name)
                         return -ENOMEM;
                 memcpy(ni->name, na->name, i);
@@ -556,8 +556,6 @@ static int ntfs_read_locked_inode(struct inode *vi)
 
         /* Setup the generic vfs inode parts now. */
 
-        /* This is the optimal IO size (for stat), not the fs block size. */
-        vi->i_blksize = PAGE_CACHE_SIZE;
         /*
          * This is for checking whether an inode has changed w.r.t. a file so
          * that the file can be updated if necessary (compare with f_version).
@@ -1234,7 +1232,6 @@ static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi)
         base_ni = NTFS_I(base_vi);
 
         /* Just mirror the values from the base inode. */
-        vi->i_blksize   = base_vi->i_blksize;
         vi->i_version   = base_vi->i_version;
         vi->i_uid       = base_vi->i_uid;
         vi->i_gid       = base_vi->i_gid;
@@ -1504,7 +1501,6 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi)
         ni      = NTFS_I(vi);
         base_ni = NTFS_I(base_vi);
         /* Just mirror the values from the base inode. */
-        vi->i_blksize   = base_vi->i_blksize;
         vi->i_version   = base_vi->i_version;
         vi->i_uid       = base_vi->i_uid;
         vi->i_gid       = base_vi->i_gid;
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 2438c00ec0ce..584260fd6848 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -331,7 +331,7 @@ map_err_out:
                 ntfs_inode **tmp;
                 int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *);
 
-                tmp = (ntfs_inode **)kmalloc(new_size, GFP_NOFS);
+                tmp = kmalloc(new_size, GFP_NOFS);
                 if (unlikely(!tmp)) {
                         ntfs_error(base_ni->vol->sb, "Failed to allocate "
                                         "internal buffer.");
@@ -2638,11 +2638,6 @@ mft_rec_already_initialized:
                 }
                 vi->i_ino = bit;
                 /*
-                 * This is the optimal IO size (for stat), not the fs block
-                 * size.
-                 */
-                vi->i_blksize = PAGE_CACHE_SIZE;
-                /*
                  * This is for checking whether an inode has changed w.r.t. a
                  * file so that the file can be updated if necessary (compare
                  * with f_version).
@@ -2893,7 +2888,7 @@ rollback:
         if (!(base_ni->nr_extents & 3)) {
                 int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode*);
 
-                extent_nis = (ntfs_inode**)kmalloc(new_size, GFP_NOFS);
+                extent_nis = kmalloc(new_size, GFP_NOFS);
                 if (unlikely(!extent_nis)) {
                         ntfs_error(vol->sb, "Failed to allocate internal "
                                         "buffer during rollback.%s", es);
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 74e0ee8fce72..6b2712f10dd2 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -3248,32 +3248,14 @@ ictx_err_out:
 
 static void __exit exit_ntfs_fs(void)
 {
-        int err = 0;
-
         ntfs_debug("Unregistering NTFS driver.");
 
         unregister_filesystem(&ntfs_fs_type);
-
-        if (kmem_cache_destroy(ntfs_big_inode_cache) && (err = 1))
-                printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
-                                ntfs_big_inode_cache_name);
-        if (kmem_cache_destroy(ntfs_inode_cache) && (err = 1))
-                printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
-                                ntfs_inode_cache_name);
-        if (kmem_cache_destroy(ntfs_name_cache) && (err = 1))
-                printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
-                                ntfs_name_cache_name);
-        if (kmem_cache_destroy(ntfs_attr_ctx_cache) && (err = 1))
-                printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
-                                ntfs_attr_ctx_cache_name);
-        if (kmem_cache_destroy(ntfs_index_ctx_cache) && (err = 1))
-                printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
-                                ntfs_index_ctx_cache_name);
-        if (err)
-                printk(KERN_CRIT "NTFS: This causes memory to leak! There is "
-                                "probably a BUG in the driver! Please report "
-                                "you saw this message to "
-                                "linux-ntfs-dev@lists.sourceforge.net\n");
+        kmem_cache_destroy(ntfs_big_inode_cache);
+        kmem_cache_destroy(ntfs_inode_cache);
+        kmem_cache_destroy(ntfs_name_cache);
+        kmem_cache_destroy(ntfs_attr_ctx_cache);
+        kmem_cache_destroy(ntfs_index_ctx_cache);
         /* Unregister the ntfs sysctls. */
         ntfs_sysctl(0);
 }
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index b123c0fa6bf6..a1b572196fe4 100644
--- a/fs/ntfs/unistr.c
+++ b/fs/ntfs/unistr.c
@@ -350,7 +350,7 @@ int ntfs_ucstonls(const ntfs_volume *vol, const ntfschar *ins,
                 }
                 if (!ns) {
                         ns_len = ins_len * NLS_MAX_CHARSET_SIZE;
-                        ns = (unsigned char*)kmalloc(ns_len + 1, GFP_NOFS);
+                        ns = kmalloc(ns_len + 1, GFP_NOFS);
                         if (!ns)
                                 goto mem_err_out;
                 }
@@ -365,7 +365,7 @@ retry:			wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o,
                         else if (wc == -ENAMETOOLONG && ns != *outs) {
                                 unsigned char *tc;
                                 /* Grow in multiples of 64 bytes. */
-                                tc = (unsigned char*)kmalloc((ns_len + 64) &
+                                tc = kmalloc((ns_len + 64) &
                                                 ~63, GFP_NOFS);
                                 if (tc) {
                                         memcpy(tc, ns, ns_len);