JFS: kzalloc conversion

this converts fs/jfs to kzalloc() usage.
compile tested with make allyesconfig

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
This commit is contained in:
Eric Sesterhenn 2006-02-23 09:47:13 -06:00 committed by Dave Kleikamp
parent d9e902668e
commit 5b3030e390
3 changed files with 5 additions and 10 deletions

View File

@ -1105,11 +1105,10 @@ int lmLogOpen(struct super_block *sb)
} }
} }
if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) { if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL))) {
up(&jfs_log_sem); up(&jfs_log_sem);
return -ENOMEM; return -ENOMEM;
} }
memset(log, 0, sizeof(struct jfs_log));
INIT_LIST_HEAD(&log->sb_list); INIT_LIST_HEAD(&log->sb_list);
init_waitqueue_head(&log->syncwait); init_waitqueue_head(&log->syncwait);
@ -1181,9 +1180,8 @@ static int open_inline_log(struct super_block *sb)
struct jfs_log *log; struct jfs_log *log;
int rc; int rc;
if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
memset(log, 0, sizeof(struct jfs_log));
INIT_LIST_HEAD(&log->sb_list); INIT_LIST_HEAD(&log->sb_list);
init_waitqueue_head(&log->syncwait); init_waitqueue_head(&log->syncwait);
@ -1216,12 +1214,11 @@ static int open_dummy_log(struct super_block *sb)
down(&jfs_log_sem); down(&jfs_log_sem);
if (!dummy_log) { if (!dummy_log) {
dummy_log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL); dummy_log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL);
if (!dummy_log) { if (!dummy_log) {
up(&jfs_log_sem); up(&jfs_log_sem);
return -ENOMEM; return -ENOMEM;
} }
memset(dummy_log, 0, sizeof(struct jfs_log));
INIT_LIST_HEAD(&dummy_log->sb_list); INIT_LIST_HEAD(&dummy_log->sb_list);
init_waitqueue_head(&dummy_log->syncwait); init_waitqueue_head(&dummy_log->syncwait);
dummy_log->no_integrity = 1; dummy_log->no_integrity = 1;

View File

@ -104,10 +104,9 @@ static inline int insert_metapage(struct page *page, struct metapage *mp)
if (PagePrivate(page)) if (PagePrivate(page))
a = mp_anchor(page); a = mp_anchor(page);
else { else {
a = kmalloc(sizeof(struct meta_anchor), GFP_NOFS); a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS);
if (!a) if (!a)
return -ENOMEM; return -ENOMEM;
memset(a, 0, sizeof(struct meta_anchor));
set_page_private(page, (unsigned long)a); set_page_private(page, (unsigned long)a);
SetPagePrivate(page); SetPagePrivate(page);
kmap(page); kmap(page);

View File

@ -395,10 +395,9 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
if (!new_valid_dev(sb->s_bdev->bd_dev)) if (!new_valid_dev(sb->s_bdev->bd_dev))
return -EOVERFLOW; return -EOVERFLOW;
sbi = kmalloc(sizeof (struct jfs_sb_info), GFP_KERNEL); sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
if (!sbi) if (!sbi)
return -ENOSPC; return -ENOSPC;
memset(sbi, 0, sizeof (struct jfs_sb_info));
sb->s_fs_info = sbi; sb->s_fs_info = sbi;
sbi->sb = sb; sbi->sb = sb;