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

Commit 3d375d9e authored by Yan Burman's avatar Yan Burman Committed by David Woodhouse
Browse files

[JFFS2] replace kmalloc+memset with kzalloc 



Replace kmalloc+memset with kzalloc

Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent db06e2a9

fs/jffs2/fs.c

+1 −2
Original line number Diff line number Diff line
@@ -502,12 +502,11 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent) 
	if (ret)

		return ret;



	c->inocache_list = kmalloc(INOCACHE_HASHSIZE * sizeof(struct jffs2_inode_cache *), GFP_KERNEL);

	c->inocache_list = kcalloc(INOCACHE_HASHSIZE, sizeof(struct jffs2_inode_cache *), GFP_KERNEL);

	if (!c->inocache_list) {

		ret = -ENOMEM;

		goto out_wbuf;

	}

	memset(c->inocache_list, 0, INOCACHE_HASHSIZE * sizeof(struct jffs2_inode_cache *));



	jffs2_init_xattr_subsystem(c);

fs/jffs2/readinode.c

+1 −2
Original line number Diff line number Diff line
@@ -944,13 +944,12 @@ int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, 
int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)

{

	struct jffs2_raw_inode n;

	struct jffs2_inode_info *f = kmalloc(sizeof(*f), GFP_KERNEL);

	struct jffs2_inode_info *f = kzalloc(sizeof(*f), GFP_KERNEL);

	int ret;



	if (!f)

		return -ENOMEM;



	memset(f, 0, sizeof(*f));

	init_MUTEX_LOCKED(&f->sem);

	f->inocache = ic;

fs/jffs2/scan.c

+1 −2
Original line number Diff line number Diff line
@@ -128,12 +128,11 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
	}



	if (jffs2_sum_active()) {

		s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);

		s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);

		if (!s) {

			JFFS2_WARNING("Can't allocate memory for summary\n");

			return -ENOMEM;

		}

		memset(s, 0, sizeof(struct jffs2_summary));

	}



	for (i=0; i<c->nr_blocks; i++) {

fs/jffs2/summary.c

+1 −3
Original line number Diff line number Diff line
@@ -26,15 +26,13 @@ 


int jffs2_sum_init(struct jffs2_sb_info *c)

{

	c->summary = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);

	c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);



	if (!c->summary) {

		JFFS2_WARNING("Can't allocate memory for summary information!\n");

		return -ENOMEM;

	}



	memset(c->summary, 0, sizeof(struct jffs2_summary));



	c->summary->sum_buf = vmalloc(c->sector_size);



	if (!c->summary->sum_buf) {