aboutsummaryrefslogtreecommitdiffstats
path: root/fs/isofs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/isofs/inode.c')
-rw-r--r--fs/isofs/inode.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 14391361c886..4527692f432b 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -96,9 +96,7 @@ static int init_inodecache(void)
96 96
97static void destroy_inodecache(void) 97static void destroy_inodecache(void)
98{ 98{
99 if (kmem_cache_destroy(isofs_inode_cachep)) 99 kmem_cache_destroy(isofs_inode_cachep);
100 printk(KERN_INFO "iso_inode_cache: not all structures were "
101 "freed\n");
102} 100}
103 101
104static int isofs_remount(struct super_block *sb, int *flags, char *data) 102static int isofs_remount(struct super_block *sb, int *flags, char *data)
@@ -557,11 +555,10 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
557 struct iso9660_options opt; 555 struct iso9660_options opt;
558 struct isofs_sb_info * sbi; 556 struct isofs_sb_info * sbi;
559 557
560 sbi = kmalloc(sizeof(*sbi), GFP_KERNEL); 558 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
561 if (!sbi) 559 if (!sbi)
562 return -ENOMEM; 560 return -ENOMEM;
563 s->s_fs_info = sbi; 561 s->s_fs_info = sbi;
564 memset(sbi, 0, sizeof(*sbi));
565 562
566 if (!parse_options((char *)data, &opt)) 563 if (!parse_options((char *)data, &opt))
567 goto out_freesbi; 564 goto out_freesbi;
@@ -1238,7 +1235,7 @@ static void isofs_read_inode(struct inode *inode)
1238 } 1235 }
1239 inode->i_uid = sbi->s_uid; 1236 inode->i_uid = sbi->s_uid;
1240 inode->i_gid = sbi->s_gid; 1237 inode->i_gid = sbi->s_gid;
1241 inode->i_blocks = inode->i_blksize = 0; 1238 inode->i_blocks = 0;
1242 1239
1243 ei->i_format_parm[0] = 0; 1240 ei->i_format_parm[0] = 0;
1244 ei->i_format_parm[1] = 0; 1241 ei->i_format_parm[1] = 0;
@@ -1294,7 +1291,6 @@ static void isofs_read_inode(struct inode *inode)
1294 isonum_711 (de->ext_attr_length)); 1291 isonum_711 (de->ext_attr_length));
1295 1292
1296 /* Set the number of blocks for stat() - should be done before RR */ 1293 /* Set the number of blocks for stat() - should be done before RR */
1297 inode->i_blksize = PAGE_CACHE_SIZE; /* For stat() only */
1298 inode->i_blocks = (inode->i_size + 511) >> 9; 1294 inode->i_blocks = (inode->i_size + 511) >> 9;
1299 1295
1300 /* 1296 /*