1 files changed, 9 insertions, 9 deletions

diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 4a543e114970..6dd18911b44c 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -66,6 +66,7 @@
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
+#include <linux/freezer.h>
 
 #include "intrep.h"
 #include "jffs_fm.h"
@@ -435,7 +436,7 @@ jffs_checksum_flash(struct mtd_info *mtd, loff_t start, int size, __u32 *result)
         int i, length;
 
         /* Allocate read buffer */
-        read_buf = (__u8 *) kmalloc (sizeof(__u8) * 4096, GFP_KERNEL);
+        read_buf = kmalloc(sizeof(__u8) * 4096, GFP_KERNEL);
         if (!read_buf) {
                 printk(KERN_NOTICE "kmalloc failed in jffs_checksum_flash()\n");
                 return -ENOMEM;
@@ -591,7 +592,7 @@ jffs_add_virtual_root(struct jffs_control *c)
         D2(printk("jffs_add_virtual_root(): "
                   "Creating a virtual root directory.\n"));
 
-        if (!(root = kmalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
+        if (!(root = kzalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
                 return -ENOMEM;
         }
         no_jffs_file++;
@@ -603,7 +604,6 @@ jffs_add_virtual_root(struct jffs_control *c)
         DJM(no_jffs_node++);
         memset(node, 0, sizeof(struct jffs_node));
         node->ino = JFFS_MIN_INO;
-        memset(root, 0, sizeof(struct jffs_file));
         root->ino = JFFS_MIN_INO;
         root->mode = S_IFDIR | S_IRWXU | S_IRGRP
                      | S_IXGRP | S_IROTH | S_IXOTH;
@@ -744,11 +744,11 @@ static int check_partly_erased_sectors(struct jffs_fmcontrol *fmc){
 
 
         /* Allocate read buffers */
-        read_buf1 = (__u8 *) kmalloc (sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
+        read_buf1 = kmalloc(sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
         if (!read_buf1)
                 return -ENOMEM;
 
-        read_buf2 = (__u8 *) kmalloc (sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
+        read_buf2 = kmalloc(sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
         if (!read_buf2) {
                 kfree(read_buf1);
                 return -ENOMEM;
@@ -876,7 +876,7 @@ jffs_scan_flash(struct jffs_control *c)
         }
 
         /* Allocate read buffer */
-        read_buf = (__u8 *) kmalloc (sizeof(__u8) * 4096, GFP_KERNEL);
+        read_buf = kmalloc(sizeof(__u8) * 4096, GFP_KERNEL);
         if (!read_buf) {
                 flash_safe_release(fmc->mtd);
                 return -ENOMEM;
@@ -1463,7 +1463,7 @@ jffs_insert_node(struct jffs_control *c, struct jffs_file *f,
                         kfree(f->name);
                         DJM(no_name--);
                 }
-                if (!(f->name = (char *) kmalloc(raw_inode->nsize + 1,
+                if (!(f->name = kmalloc(raw_inode->nsize + 1,
                                                  GFP_KERNEL))) {
                         return -ENOMEM;
                 }
@@ -1737,7 +1737,7 @@ jffs_find_child(struct jffs_file *dir, const char *name, int len)
                 printk("jffs_find_child(): Found \"%s\".\n", f->name);
         }
         else {
-                char *copy = (char *) kmalloc(len + 1, GFP_KERNEL);
+                char *copy = kmalloc(len + 1, GFP_KERNEL);
                 if (copy) {
                         memcpy(copy, name, len);
                         copy[len] = '\0';
@@ -2627,7 +2627,7 @@ jffs_print_tree(struct jffs_file *first_file, int indent)
                 return;
         }
 
-        if (!(space = (char *) kmalloc(indent + 1, GFP_KERNEL))) {
+        if (!(space = kmalloc(indent + 1, GFP_KERNEL))) {
                 printk("jffs_print_tree(): Out of memory!\n");
                 return;
         }