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 4.11 074/150] ext4: fix fdatasync(2) after extent manipulation operations
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jan Kara <jack@suse.cz>

    commit 67a7d5f561f469ad2fa5154d2888258ab8e6df7c upstream.

    Currently, extent manipulation operations such as hole punch, range
    zeroing, or extent shifting do not record the fact that file data has
    changed and thus fdatasync(2) has a work to do. As a result if we crash
    e.g. after a punch hole and fdatasync, user can still possibly see the
    punched out data after journal replay. Test generic/392 fails due to
    these problems.

    Fix the problem by properly marking that file data has changed in these
    operations.

    Fixes: a4bb6b64e39abc0e41ca077725f2a72c868e7622
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/extents.c | 5 +++++
    fs/ext4/inode.c | 2 ++
    2 files changed, 7 insertions(+)

    --- a/fs/ext4/extents.c
    +++ b/fs/ext4/extents.c
    @@ -4877,6 +4877,8 @@ static long ext4_zero_range(struct file

    /* Zero out partial block at the edges of the range */
    ret = ext4_zero_partial_blocks(handle, inode, offset, len);
    + if (ret >= 0)
    + ext4_update_inode_fsync_trans(handle, inode, 1);

    if (file->f_flags & O_SYNC)
    ext4_handle_sync(handle);
    @@ -5563,6 +5565,7 @@ int ext4_collapse_range(struct inode *in
    ext4_handle_sync(handle);
    inode->i_mtime = inode->i_ctime = current_time(inode);
    ext4_mark_inode_dirty(handle, inode);
    + ext4_update_inode_fsync_trans(handle, inode, 1);

    out_stop:
    ext4_journal_stop(handle);
    @@ -5736,6 +5739,8 @@ int ext4_insert_range(struct inode *inod
    up_write(&EXT4_I(inode)->i_data_sem);
    if (IS_SYNC(inode))
    ext4_handle_sync(handle);
    + if (ret >= 0)
    + ext4_update_inode_fsync_trans(handle, inode, 1);

    out_stop:
    ext4_journal_stop(handle);
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -4165,6 +4165,8 @@ int ext4_punch_hole(struct inode *inode,

    inode->i_mtime = inode->i_ctime = current_time(inode);
    ext4_mark_inode_dirty(handle, inode);
    + if (ret >= 0)
    + ext4_update_inode_fsync_trans(handle, inode, 1);
    out_stop:
    ext4_journal_stop(handle);
    out_dio:

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