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

Commit 15a07c7c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ext4: fix check to prevent initializing reserved inodes"

parents 8cc6f66d ca05d702

fs/ext4/ialloc.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1394,7 +1394,10 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, 
			    ext4_itable_unused_count(sb, gdp)),

			    ext4_itable_unused_count(sb, gdp)),

			    sbi->s_inodes_per_block);

			    sbi->s_inodes_per_block);





	if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group)) {

	if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group) ||

	    ((group == 0) && ((EXT4_INODES_PER_GROUP(sb) -

			       ext4_itable_unused_count(sb, gdp)) <

			      EXT4_FIRST_INO(sb)))) {

		ext4_error(sb, "Something is wrong with group %u: "

		ext4_error(sb, "Something is wrong with group %u: "

			   "used itable blocks: %d; "

			   "used itable blocks: %d; "

			   "itable unused count: %u",

			   "itable unused count: %u",

fs/ext4/super.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -3100,14 +3100,8 @@ static ext4_group_t ext4_has_uninit_itable(struct super_block *sb) 
		if (!gdp)

		if (!gdp)

			continue;

			continue;





		if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED))

		if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))

			continue;

		if (group != 0)

			break;

			break;

		ext4_error(sb, "Inode table for bg 0 marked as "

			   "needing zeroing");

		if (sb_rdonly(sb))

			return ngroups;

	}

	}





	return group;

	return group;