[PATCH] fs: Removing useless casts

* Removing useless casts
* Removing useless wrapper
* Conversion from kmalloc+memset to kzalloc

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Acked-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

21 files changed, 37 insertions, 48 deletions

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 71f2ea632e53..8651ea6a23b7 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -513,7 +513,7 @@ static int coda_venus_readdir(struct file *filp, filldir_t filldir,
         ino_t ino;
         int ret, i;
 
-        vdir = (struct venus_dirent *)kmalloc(sizeof(*vdir), GFP_KERNEL);
+        vdir = kmalloc(sizeof(*vdir), GFP_KERNEL);
         if (!vdir) return -ENOMEM;
 
         i = filp->f_pos;
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index da52b4a5db64..7c420b800c34 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -89,8 +89,8 @@ ext2_acl_to_disk(const struct posix_acl *acl, size_t *size)
         size_t n;
 
         *size = ext2_acl_size(acl->a_count);
-        ext_acl = (ext2_acl_header *)kmalloc(sizeof(ext2_acl_header) +
-                acl->a_count * sizeof(ext2_acl_entry), GFP_KERNEL);
+        ext_acl = kmalloc(sizeof(ext2_acl_header) + acl->a_count *
+                        sizeof(ext2_acl_entry), GFP_KERNEL);
         if (!ext_acl)
                 return ERR_PTR(-ENOMEM);
         ext_acl->a_version = cpu_to_le32(EXT2_ACL_VERSION);
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 92bf78221429..1e5038d9a01b 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -90,8 +90,8 @@ ext3_acl_to_disk(const struct posix_acl *acl, size_t *size)
         size_t n;
 
         *size = ext3_acl_size(acl->a_count);
-        ext_acl = (ext3_acl_header *)kmalloc(sizeof(ext3_acl_header) +
-                acl->a_count * sizeof(ext3_acl_entry), GFP_KERNEL);
+        ext_acl = kmalloc(sizeof(ext3_acl_header) + acl->a_count *
+                        sizeof(ext3_acl_entry), GFP_KERNEL);
         if (!ext_acl)
                 return ERR_PTR(-ENOMEM);
         ext_acl->a_version = cpu_to_le32(EXT3_ACL_VERSION);
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 9e318a5cfc87..b73cba12f79c 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -439,8 +439,8 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
         if ((err = ext3_reserve_inode_write(handle, inode, &iloc)))
                 goto exit_dindj;
 
-        n_group_desc = (struct buffer_head **)kmalloc((gdb_num + 1) *
-                                sizeof(struct buffer_head *), GFP_KERNEL);
+        n_group_desc = kmalloc((gdb_num + 1) * sizeof(struct buffer_head *),
+                        GFP_KERNEL);
         if (!n_group_desc) {
                 err = -ENOMEM;
                 ext3_warning (sb, __FUNCTION__,
diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c
index 2807aa833e62..b52b7381d10f 100644
--- a/fs/hpfs/buffer.c
+++ b/fs/hpfs/buffer.c
@@ -76,7 +76,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe
                 return NULL;
         }
 
-        qbh->data = data = (char *)kmalloc(2048, GFP_NOFS);
+        qbh->data = data = kmalloc(2048, GFP_NOFS);
         if (!data) {
                 printk("HPFS: hpfs_map_4sectors: out of memory\n");
                 goto bail;
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 93068697a9bf..b59553d28d13 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -652,7 +652,7 @@ jffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         lock_kernel();
 
         D3({
-                char *s = (char *)kmalloc(len + 1, GFP_KERNEL);
+                char *s = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(s, name, len);
                 s[len] = '\0';
                 printk("jffs_lookup(): dir: 0x%p, name: \"%s\"\n", dir, s);
@@ -1173,8 +1173,8 @@ jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
         lock_kernel();
         D1({
                 int len = dentry->d_name.len; 
-                char *_name = (char *)kmalloc(len + 1, GFP_KERNEL);
-                char *_symname = (char *)kmalloc(symname_len + 1, GFP_KERNEL);
+                char *_name = kmalloc(len + 1, GFP_KERNEL);
+                char *_symname = kmalloc(symname_len + 1, GFP_KERNEL);
                 memcpy(_name, dentry->d_name.name, len);
                 _name[len] = '\0';
                 memcpy(_symname, symname, symname_len);
@@ -1282,7 +1282,7 @@ jffs_create(struct inode *dir, struct dentry *dentry, int mode,
         lock_kernel();
         D1({
                 int len = dentry->d_name.len;
-                char *s = (char *)kmalloc(len + 1, GFP_KERNEL);
+                char *s = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(s, dentry->d_name.name, len);
                 s[len] = '\0';
                 printk("jffs_create(): dir: 0x%p, name: \"%s\"\n", dir, s);
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 9000f1effedf..4a543e114970 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -488,13 +488,11 @@ jffs_create_file(struct jffs_control *c,
 {
         struct jffs_file *f;
 
-        if (!(f = (struct jffs_file *)kmalloc(sizeof(struct jffs_file),
-                                              GFP_KERNEL))) {
+        if (!(f = kzalloc(sizeof(*f), GFP_KERNEL))) {
                 D(printk("jffs_create_file(): Failed!\n"));
                 return NULL;
         }
         no_jffs_file++;
-        memset(f, 0, sizeof(struct jffs_file));
         f->ino = raw_inode->ino;
         f->pino = raw_inode->pino;
         f->nlink = raw_inode->nlink;
@@ -516,7 +514,7 @@ jffs_create_control(struct super_block *sb)
 
         D2(printk("jffs_create_control()\n"));
 
-        if (!(c = (struct jffs_control *)kmalloc(s, GFP_KERNEL))) {
+        if (!(c = kmalloc(s, GFP_KERNEL))) {
                 goto fail_control;
         }
         DJM(no_jffs_control++);
@@ -524,7 +522,7 @@ jffs_create_control(struct super_block *sb)
         c->gc_task = NULL;
         c->hash_len = JFFS_HASH_SIZE;
         s = sizeof(struct list_head) * c->hash_len;
-        if (!(c->hash = (struct list_head *)kmalloc(s, GFP_KERNEL))) {
+        if (!(c->hash = kmalloc(s, GFP_KERNEL))) {
                 goto fail_hash;
         }
         DJM(no_hash++);
@@ -593,8 +591,7 @@ jffs_add_virtual_root(struct jffs_control *c)
         D2(printk("jffs_add_virtual_root(): "
                   "Creating a virtual root directory.\n"));
 
-        if (!(root = (struct jffs_file *)kmalloc(sizeof(struct jffs_file),
-                                                 GFP_KERNEL))) {
+        if (!(root = kmalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
                 return -ENOMEM;
         }
         no_jffs_file++;
diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c
index 7d8ca1aeace2..29b68d939bd9 100644
--- a/fs/jffs/jffs_fm.c
+++ b/fs/jffs/jffs_fm.c
@@ -94,8 +94,7 @@ jffs_build_begin(struct jffs_control *c, int unit)
         struct mtd_info *mtd;
         
         D3(printk("jffs_build_begin()\n"));
-        fmc = (struct jffs_fmcontrol *)kmalloc(sizeof(struct jffs_fmcontrol),
-                                               GFP_KERNEL);
+        fmc = kmalloc(sizeof(*fmc), GFP_KERNEL);
         if (!fmc) {
                 D(printk("jffs_build_begin(): Allocation of "
                          "struct jffs_fmcontrol failed!\n"));
@@ -486,8 +485,7 @@ jffs_add_node(struct jffs_node *node)
 
         D3(printk("jffs_add_node(): ino = %u\n", node->ino));
 
-        ref = (struct jffs_node_ref *)kmalloc(sizeof(struct jffs_node_ref),
-                                              GFP_KERNEL);
+        ref = kmalloc(sizeof(*ref), GFP_KERNEL);
         if (!ref)
                 return -ENOMEM;
 
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index efbb586bed4b..3856efc399c1 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -282,7 +282,7 @@ int txInit(void)
         TxLockVHWM = (nTxLock * 8) / 10;
 
         size = sizeof(struct tblock) * nTxBlock;
-        TxBlock = (struct tblock *) vmalloc(size);
+        TxBlock = vmalloc(size);
         if (TxBlock == NULL)
                 return -ENOMEM;
 
@@ -307,7 +307,7 @@ int txInit(void)
          * tlock id = 0 is reserved.
          */
         size = sizeof(struct tlock) * nTxLock;
-        TxLock = (struct tlock *) vmalloc(size);
+        TxLock = vmalloc(size);
         if (TxLock == NULL) {
                 vfree(TxBlock);
                 return -ENOMEM;
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 50dbb67ae0c4..271e2165fff6 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -100,7 +100,7 @@ static struct nlm_lockowner *nlm_find_lockowner(struct nlm_host *host, fl_owner_
         res = __nlm_find_lockowner(host, owner);
         if (res == NULL) {
                 spin_unlock(&host->h_lock);
-                new = (struct nlm_lockowner *)kmalloc(sizeof(*new), GFP_KERNEL);
+                new = kmalloc(sizeof(*new), GFP_KERNEL);
                 spin_lock(&host->h_lock);
                 res = __nlm_find_lockowner(host, owner);
                 if (res == NULL && new != NULL) {
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c
index ca92c2406635..e3d26c1bd105 100644
--- a/fs/ncpfs/symlink.c
+++ b/fs/ncpfs/symlink.c
@@ -48,7 +48,7 @@ static int ncp_symlink_readpage(struct file *file, struct page *page)
         char *buf = kmap(page);
 
         error = -ENOMEM;
-        rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
+        rawlink = kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
         if (!rawlink)
                 goto fail;
 
@@ -126,7 +126,7 @@ int ncp_symlink(struct inode *dir, struct dentry *dentry, const char *symname) {
         /* EPERM is returned by VFS if symlink procedure does not exist */
                 return -EPERM;
   
-        rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
+        rawlink = kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL);
         if (!rawlink)
                 return -ENOMEM;
 
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 57133678db16..841c99a9b11c 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -20,11 +20,6 @@
 #include "delegation.h"
 #include "internal.h"
 
-static struct nfs_delegation *nfs_alloc_delegation(void)
-{
-        return (struct nfs_delegation *)kmalloc(sizeof(struct nfs_delegation), GFP_KERNEL);
-}
-
 static void nfs_free_delegation(struct nfs_delegation *delegation)
 {
         if (delegation->cred)
@@ -124,7 +119,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
         if ((nfsi->cache_validity & (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_ATTR)))
                 __nfs_revalidate_inode(NFS_SERVER(inode), inode);
 
-        delegation = nfs_alloc_delegation();
+        delegation = kmalloc(sizeof(*delegation), GFP_KERNEL);
         if (delegation == NULL)
                 return -ENOMEM;
         memcpy(delegation->stateid.data, res->delegation.data,
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e8c143d182c4..a9d0f71eb5f7 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -443,7 +443,7 @@ static struct nfs_open_context *alloc_nfs_open_context(struct vfsmount *mnt, str
 {
         struct nfs_open_context *ctx;
 
-        ctx = (struct nfs_open_context *)kmalloc(sizeof(*ctx), GFP_KERNEL);
+        ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx != NULL) {
                 atomic_set(&ctx->count, 1);
                 ctx->dentry = dget(dentry);
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index f8688eaa0001..3b234d4601e7 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -449,7 +449,7 @@ nfs3_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr
                 struct nfs_fattr res;
         } *ptr;
 
-        ptr = (struct unlinkxdr *)kmalloc(sizeof(*ptr), GFP_KERNEL);
+        ptr = kmalloc(sizeof(*ptr), GFP_KERNEL);
         if (!ptr)
                 return -ENOMEM;
         ptr->arg.fh = NFS_FH(dir->d_inode);
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 630e50647bbb..4529cc4f3f8f 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -352,7 +352,7 @@ nfs_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *
 {
         struct nfs_diropargs    *arg;
 
-        arg = (struct nfs_diropargs *)kmalloc(sizeof(*arg), GFP_KERNEL);
+        arg = kmalloc(sizeof(*arg), GFP_KERNEL);
         if (!arg)
                 return -ENOMEM;
         arg->fh = NFS_FH(dir->d_inode);
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..31852121b3f5 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);
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 2438c00ec0ce..578fb3d5e803 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.");
@@ -2893,7 +2893,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/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);
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 3d4f6dff2113..41cfcba7ce49 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -370,7 +370,7 @@ xfs_file_readdir(
 
         /* Try fairly hard to get memory */
         do {
-                if ((read_buf = (caddr_t)kmalloc(rlen, GFP_KERNEL)))
+                if ((read_buf = kmalloc(rlen, GFP_KERNEL)))
                         break;
                 rlen >>= 1;
         } while (rlen >= 1024);
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index d9180020de63..22e3b714f629 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -553,13 +553,13 @@ xfs_vn_follow_link(
         ASSERT(dentry);
         ASSERT(nd);
 
-        link = (char *)kmalloc(MAXPATHLEN+1, GFP_KERNEL);
+        link = kmalloc(MAXPATHLEN+1, GFP_KERNEL);
         if (!link) {
                 nd_set_link(nd, ERR_PTR(-ENOMEM));
                 return NULL;
         }
 
-        uio = (uio_t *)kmalloc(sizeof(uio_t), GFP_KERNEL);
+        uio = kmalloc(sizeof(uio_t), GFP_KERNEL);
         if (!uio) {
                 kfree(link);
                 nd_set_link(nd, ERR_PTR(-ENOMEM));