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

Commit 5d4958f9 authored by Avantika Mathur's avatar Avantika Mathur Committed by Linus Torvalds
Browse files

[PATCH] ext4: kmalloc to kzalloc 



Performs kmalloc to kzalloc conversion

Signed-off-by: default avatarAvantika Mathur <mathur@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7e028976

fs/ext4/extents.c

+3 −6
Original line number Diff line number Diff line
@@ -477,13 +477,12 @@ ext4_ext_find_extent(struct inode *inode, int block, struct ext4_ext_path *path) 


	/* account possible depth increase */

	if (!path) {

		path = kmalloc(sizeof(struct ext4_ext_path) * (depth + 2),

		path = kzalloc(sizeof(struct ext4_ext_path) * (depth + 2),

				GFP_NOFS);

		if (!path)

			return ERR_PTR(-ENOMEM);

		alloc = 1;

	}

	memset(path, 0, sizeof(struct ext4_ext_path) * (depth + 1));

	path[0].p_hdr = eh;



	/* walk through the tree */
@@ -643,10 +642,9 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, 
	 * We need this to handle errors and free blocks

	 * upon them.

	 */

	ablocks = kmalloc(sizeof(ext4_fsblk_t) * depth, GFP_NOFS);

	ablocks = kzalloc(sizeof(ext4_fsblk_t) * depth, GFP_NOFS);

	if (!ablocks)

		return -ENOMEM;

	memset(ablocks, 0, sizeof(ext4_fsblk_t) * depth);



	/* allocate all needed blocks */

	ext_debug("allocate %d blocks for indexes/leaf\n", depth - at);
@@ -1773,12 +1771,11 @@ int ext4_ext_remove_space(struct inode *inode, unsigned long start) 
	 * We start scanning from right side, freeing all the blocks

	 * after i_size and walking into the tree depth-wise.

	 */

	path = kmalloc(sizeof(struct ext4_ext_path) * (depth + 1), GFP_KERNEL);

	path = kzalloc(sizeof(struct ext4_ext_path) * (depth + 1), GFP_KERNEL);

	if (path == NULL) {

		ext4_journal_stop(handle);

		return -ENOMEM;

	}

	memset(path, 0, sizeof(struct ext4_ext_path) * (depth + 1));

	path[0].p_hdr = ext_inode_hdr(inode);

	if (ext4_ext_check_header(__FUNCTION__, inode, path[0].p_hdr)) {

		err = -EIO;