diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-05-22 05:36:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-14 13:54:18 +0300 |
| commit | 99362b9cf1fc5a179c3a975b32f98b0453e56815 (patch) | |
| tree | 9b7e5d2afeed42d7594527e320ee832a0ea9c655 /fs/ext4/inode.c | |
| parent | 07e47097fb7ddf31ecff18e435d3ac3d996cf60d (diff) | |
| download | linux-99362b9cf1fc5a179c3a975b32f98b0453e56815.tar.xz | |
ext4: keep existing extra fields when inode expands
commit 887a9730614727c4fff7cb756711b190593fc1df upstream.
ext4_expand_extra_isize() should clear only space between old and new
size.
Fixes: 6dd4ee7cab7e # v2.6.23
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/inode.c')
| -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 e5dc3007627a..39a263ecca18 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4830,8 +4830,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; } |