Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b3030e3 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Dave Kleikamp
Browse files

JFS: kzalloc conversion 



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

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
parent d9e90266

fs/jfs/jfs_logmgr.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

		return -ENOMEM;

	}

	memset(log, 0, sizeof(struct jfs_log));

	INIT_LIST_HEAD(&log->sb_list);

	init_waitqueue_head(&log->syncwait);
@@ -1181,9 +1180,8 @@ static int open_inline_log(struct super_block *sb) 
	struct jfs_log *log;

	int rc;



	if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL)))

	if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL)))

		return -ENOMEM;

	memset(log, 0, sizeof(struct jfs_log));

	INIT_LIST_HEAD(&log->sb_list);

	init_waitqueue_head(&log->syncwait);
@@ -1216,12 +1214,11 @@ static int open_dummy_log(struct super_block *sb) 


	down(&jfs_log_sem);

	if (!dummy_log) {

		dummy_log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL);

		dummy_log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL);

		if (!dummy_log) {

			up(&jfs_log_sem);

			return -ENOMEM;

		}

		memset(dummy_log, 0, sizeof(struct jfs_log));

		INIT_LIST_HEAD(&dummy_log->sb_list);

		init_waitqueue_head(&dummy_log->syncwait);

		dummy_log->no_integrity = 1;

fs/jfs/jfs_metapage.c

+1 −2
Original line number Diff line number Diff line
@@ -104,10 +104,9 @@ static inline int insert_metapage(struct page *page, struct metapage *mp) 
	if (PagePrivate(page))

		a = mp_anchor(page);

	else {

		a = kmalloc(sizeof(struct meta_anchor), GFP_NOFS);

		a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS);

		if (!a)

			return -ENOMEM;

		memset(a, 0, sizeof(struct meta_anchor));

		set_page_private(page, (unsigned long)a);

		SetPagePrivate(page);

		kmap(page);

fs/jfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -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))

		return -EOVERFLOW;



	sbi = kmalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);

	sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);

	if (!sbi)

		return -ENOSPC;

	memset(sbi, 0, sizeof (struct jfs_sb_info));

	sb->s_fs_info = sbi;

	sbi->sb = sb;