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

Commit 94de56ab authored by Joe Perches's avatar Joe Perches Committed by Theodore Ts'o
Browse files

ext4: Use vzalloc in ext4_fill_flex_info() 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent af0b44a1

fs/ext4/super.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -1930,15 +1930,14 @@ static int ext4_fill_flex_info(struct super_block *sb) 
	size = flex_group_count * sizeof(struct flex_groups);

	size = flex_group_count * sizeof(struct flex_groups);

	sbi->s_flex_groups = kzalloc(size, GFP_KERNEL);

	sbi->s_flex_groups = kzalloc(size, GFP_KERNEL);

	if (sbi->s_flex_groups == NULL) {

	if (sbi->s_flex_groups == NULL) {

		sbi->s_flex_groups = vmalloc(size);

		sbi->s_flex_groups = vzalloc(size);

		if (sbi->s_flex_groups)

			memset(sbi->s_flex_groups, 0, size);

	}

		if (sbi->s_flex_groups == NULL) {

		if (sbi->s_flex_groups == NULL) {

		ext4_msg(sb, KERN_ERR, "not enough memory for "

			ext4_msg(sb, KERN_ERR,

				"%u flex groups", flex_group_count);

				 "not enough memory for %u flex groups",

				 flex_group_count);

			goto failed;

			goto failed;

		}

		}

	}





	for (i = 0; i < sbi->s_groups_count; i++) {

	for (i = 0; i < sbi->s_groups_count; i++) {

		gdp = ext4_get_group_desc(sb, i, NULL);

		gdp = ext4_get_group_desc(sb, i, NULL);