[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)