aboutsummaryrefslogtreecommitdiffstats
path: root/fs/qnx4/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/qnx4/inode.c')
-rw-r--r--fs/qnx4/inode.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 5a903491e697..5a41db2a218d 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -358,11 +358,10 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
358 const char *errmsg; 358 const char *errmsg;
359 struct qnx4_sb_info *qs; 359 struct qnx4_sb_info *qs;
360 360
361 qs = kmalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL); 361 qs = kzalloc(sizeof(struct qnx4_sb_info), GFP_KERNEL);
362 if (!qs) 362 if (!qs)
363 return -ENOMEM; 363 return -ENOMEM;
364 s->s_fs_info = qs; 364 s->s_fs_info = qs;
365 memset(qs, 0, sizeof(struct qnx4_sb_info));
366 365
367 sb_set_blocksize(s, QNX4_BLOCK_SIZE); 366 sb_set_blocksize(s, QNX4_BLOCK_SIZE);
368 367
@@ -497,7 +496,6 @@ static void qnx4_read_inode(struct inode *inode)
497 inode->i_ctime.tv_sec = le32_to_cpu(raw_inode->di_ctime); 496 inode->i_ctime.tv_sec = le32_to_cpu(raw_inode->di_ctime);
498 inode->i_ctime.tv_nsec = 0; 497 inode->i_ctime.tv_nsec = 0;
499 inode->i_blocks = le32_to_cpu(raw_inode->di_first_xtnt.xtnt_size); 498 inode->i_blocks = le32_to_cpu(raw_inode->di_first_xtnt.xtnt_size);
500 inode->i_blksize = QNX4_DIR_ENTRY_SIZE;
501 499
502 memcpy(qnx4_inode, raw_inode, QNX4_DIR_ENTRY_SIZE); 500 memcpy(qnx4_inode, raw_inode, QNX4_DIR_ENTRY_SIZE);
503 if (S_ISREG(inode->i_mode)) { 501 if (S_ISREG(inode->i_mode)) {
@@ -557,9 +555,7 @@ static int init_inodecache(void)
557 555
558static void destroy_inodecache(void) 556static void destroy_inodecache(void)
559{ 557{
560 if (kmem_cache_destroy(qnx4_inode_cachep)) 558 kmem_cache_destroy(qnx4_inode_cachep);
561 printk(KERN_INFO
562 "qnx4_inode_cache: not all structures were freed\n");
563} 559}
564 560
565static int qnx4_get_sb(struct file_system_type *fs_type, 561static int qnx4_get_sb(struct file_system_type *fs_type,