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

Commit 11bb168b authored by ruippan (潘睿)'s avatar ruippan (潘睿) Committed by Greg Kroah-Hartman
Browse files

ext4: fix EXT4_IOC_GROUP_ADD ioctl 



commit e647e29196b7f802f8242c39ecb7cc937f5ef217 upstream.

Commit e2b911c5 ("ext4: clean up feature test macros with
predicate functions") broke the EXT4_IOC_GROUP_ADD ioctl.  This was
not noticed since only very old versions of resize2fs (before
e2fsprogs 1.42) use this ioctl.  However, using a new kernel with an
enterprise Linux userspace will cause attempts to use online resize to
fail with "No reserved GDT blocks".

Fixes: e2b911c5 ("ext4: clean up feature test macros with predicate...")
Cc: stable@kernel.org # v4.4
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarruippan (潘睿) <ruippan@tencent.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d078853

fs/ext4/resize.c

+1 −1
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) 
	}



	if (reserved_gdb || gdb_off == 0) {

		if (ext4_has_feature_resize_inode(sb) ||

		if (!ext4_has_feature_resize_inode(sb) ||

		    !le16_to_cpu(es->s_reserved_gdt_blocks)) {

			ext4_warning(sb,

				     "No reserved GDT blocks, can't resize");