3 files changed, 27 insertions, 34 deletions

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 93068697a9bf..f5cf9c93e243 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -364,12 +364,11 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode,
         inode->i_ctime.tv_nsec = 0;
         inode->i_mtime.tv_nsec = 0;
         inode->i_atime.tv_nsec = 0;
-        inode->i_blksize = PAGE_SIZE;
         inode->i_blocks = (inode->i_size + 511) >> 9;
 
         f = jffs_find_file(c, raw_inode->ino);
 
-        inode->u.generic_ip = (void *)f;
+        inode->i_private = (void *)f;
         insert_inode_hash(inode);
 
         return inode;
@@ -442,7 +441,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry,
         });
 
         result = -ENOTDIR;
-        if (!(old_dir_f = (struct jffs_file *)old_dir->u.generic_ip)) {
+        if (!(old_dir_f = old_dir->i_private)) {
                 D(printk("jffs_rename(): Old dir invalid.\n"));
                 goto jffs_rename_end;
         }
@@ -456,7 +455,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
         /* Find the new directory.  */
         result = -ENOTDIR;
-        if (!(new_dir_f = (struct jffs_file *)new_dir->u.generic_ip)) {
+        if (!(new_dir_f = new_dir->i_private)) {
                 D(printk("jffs_rename(): New dir invalid.\n"));
                 goto jffs_rename_end;
         }
@@ -593,7 +592,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
                 else {
                         ddino = ((struct jffs_file *)
-                                 inode->u.generic_ip)->pino;
+                                 inode->i_private)->pino;
                 }
                 D3(printk("jffs_readdir(): \"..\" %u\n", ddino));
                 if (filldir(dirent, "..", 2, filp->f_pos, ddino, DT_DIR) < 0) {
@@ -604,7 +603,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
                 filp->f_pos++;
         }
-        f = ((struct jffs_file *)inode->u.generic_ip)->children;
+        f = ((struct jffs_file *)inode->i_private)->children;
 
         j = 2;
         while(f && (f->deleted || j++ < filp->f_pos )) {
@@ -652,7 +651,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);
@@ -668,7 +667,7 @@ jffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         }
 
         r = -EACCES;
-        if (!(d = (struct jffs_file *)dir->u.generic_ip)) {
+        if (!(d = (struct jffs_file *)dir->i_private)) {
                 D(printk("jffs_lookup(): No such inode! (%lu)\n",
                          dir->i_ino));
                 goto jffs_lookup_end;
@@ -739,7 +738,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page)
         unsigned long read_len;
         int result;
         struct inode *inode = (struct inode*)page->mapping->host;
-        struct jffs_file *f = (struct jffs_file *)inode->u.generic_ip;
+        struct jffs_file *f = (struct jffs_file *)inode->i_private;
         struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info;
         int r;
         loff_t offset;
@@ -828,7 +827,7 @@ jffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         });
 
         lock_kernel();
-        dir_f = (struct jffs_file *)dir->u.generic_ip;
+        dir_f = dir->i_private;
 
         ASSERT(if (!dir_f) {
                 printk(KERN_ERR "jffs_mkdir(): No reference to a "
@@ -972,7 +971,7 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type)
                 kfree(_name);
         });
 
-        dir_f = (struct jffs_file *) dir->u.generic_ip;
+        dir_f = dir->i_private;
         c = dir_f->c;
 
         result = -ENOENT;
@@ -1082,7 +1081,7 @@ jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
         if (!old_valid_dev(rdev))
                 return -EINVAL;
         lock_kernel();
-        dir_f = (struct jffs_file *)dir->u.generic_ip;
+        dir_f = dir->i_private;
         c = dir_f->c;
 
         D3(printk (KERN_NOTICE "mknod(): down biglock\n"));
@@ -1173,8 +1172,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);
@@ -1186,7 +1185,7 @@ jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
                 kfree(_symname);
         });
 
-        dir_f = (struct jffs_file *)dir->u.generic_ip;
+        dir_f = dir->i_private;
         ASSERT(if (!dir_f) {
                 printk(KERN_ERR "jffs_symlink(): No reference to a "
                        "jffs_file struct in inode.\n");
@@ -1282,14 +1281,14 @@ 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);
                 kfree(s);
         });
 
-        dir_f = (struct jffs_file *)dir->u.generic_ip;
+        dir_f = dir->i_private;
         ASSERT(if (!dir_f) {
                 printk(KERN_ERR "jffs_create(): No reference to a "
                        "jffs_file struct in inode.\n");
@@ -1403,9 +1402,9 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
                 goto out_isem;
         }
 
-        if (!(f = (struct jffs_file *)inode->u.generic_ip)) {
-                D(printk("jffs_file_write(): inode->u.generic_ip = 0x%p\n",
-                                inode->u.generic_ip));
+        if (!(f = inode->i_private)) {
+                D(printk("jffs_file_write(): inode->i_private = 0x%p\n",
+                                inode->i_private));
                 goto out_isem;
         }
 
@@ -1693,7 +1692,7 @@ jffs_read_inode(struct inode *inode)
                 mutex_unlock(&c->fmc->biglock);
                 return;
         }
-        inode->u.generic_ip = (void *)f;
+        inode->i_private = f;
         inode->i_mode = f->mode;
         inode->i_nlink = f->nlink;
         inode->i_uid = f->uid;
@@ -1706,7 +1705,6 @@ jffs_read_inode(struct inode *inode)
         inode->i_mtime.tv_nsec = 
         inode->i_ctime.tv_nsec = 0;
 
-        inode->i_blksize = PAGE_SIZE;
         inode->i_blocks = (inode->i_size + 511) >> 9;
         if (S_ISREG(inode->i_mode)) {
                 inode->i_op = &jffs_file_inode_operations;
@@ -1748,7 +1746,7 @@ jffs_delete_inode(struct inode *inode)
         lock_kernel();
         inode->i_size = 0;
         inode->i_blocks = 0;
-        inode->u.generic_ip = NULL;
+        inode->i_private = NULL;
         clear_inode(inode);
         if (inode->i_nlink == 0) {
                 c = (struct jffs_control *) inode->i_sb->s_fs_info;
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;