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

Commit 887a9730 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Theodore Ts'o
Browse files

ext4: keep existing extra fields when inode expands 



ext4_expand_extra_isize() should clear only space between old and new
size.

Fixes: 6dd4ee7c # v2.6.23
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 9651e6b2

fs/ext4/inode.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -5637,8 +5637,9 @@ static int ext4_expand_extra_isize(struct inode *inode, 
	/* No extended attributes present */

	/* No extended attributes present */

	if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||

	if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||

	    header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) {

	    header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) {

		memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0,

		memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE +

			new_extra_isize);

		       EXT4_I(inode)->i_extra_isize, 0,

		       new_extra_isize - EXT4_I(inode)->i_extra_isize);

		EXT4_I(inode)->i_extra_isize = new_extra_isize;

		EXT4_I(inode)->i_extra_isize = new_extra_isize;

		return 0;

		return 0;

	}

	}