diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-05-21 22:36:23 -0400 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-25 22:02:19 -0400 |
commit | 9262957933640067921a5e0858a804d38b62a604 (patch) | |
tree | cb9c445c5e392e64e0d7c72603aca1fbc38e1d1c /fs | |
parent | 4d1adc2ada19b8c059eb4f18cb107cb3104ae49d (diff) |
ext4: keep existing extra fields when inode expands
[ Upstream commit 887a9730614727c4fff7cb756711b190593fc1df ]
ext4_expand_extra_isize() should clear only space between old and new
size.
Fixes: 6dd4ee7cab7e # v2.6.23
Cc: stable@vger.kernel.org
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 66e147b446c8..2ab9fd88a7c3 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5083,8 +5083,9 @@ static int ext4_expand_extra_isize(struct inode *inode, /* No extended attributes present */ if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) || header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) { - memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0, - new_extra_isize); + memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE + + 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; return 0; } |