lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 18/45] ext4: keep existing extra fields when inode expands
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

    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>

    ---
    fs/ext4/inode.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -4830,8 +4830,9 @@ static int ext4_expand_extra_isize(struc
    /* 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;
    }

    \
     
     \ /
      Last update: 2017-06-12 17:53    [W:4.146 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site