]> git.hungrycats.org Git - linux/commitdiff
ext4: fix fdatasync(2) after fallocate(2) operation
authorEryu Guan <eguan@redhat.com>
Mon, 4 Dec 2017 03:52:51 +0000 (22:52 -0500)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 17 Jan 2018 17:55:31 +0000 (12:55 -0500)
[ Upstream commit c894aa97577e47d3066b27b32499ecf899bfa8b0 ]

Currently, fallocate(2) with KEEP_SIZE followed by a fdatasync(2)
then crash, we'll see wrong allocated block number (stat -c %b), the
blocks allocated beyond EOF are all lost. fstests generic/468
exposes this bug.

Commit 67a7d5f561f4 ("ext4: fix fdatasync(2) after extent
manipulation operations") fixed all the other extent manipulation
operation paths such as hole punch, zero range, collapse range etc.,
but forgot the fallocate case.

So similarly, fix it by recording the correct journal tid in ext4
inode in fallocate(2) path, so that ext4_sync_file() will wait for
the right tid to be committed on fdatasync(2).

This addresses the test failure in xfstests test generic/468.

Signed-off-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
fs/ext4/extents.c

index 447d64e47c4c01800f583e61e711387640de4ad0..dbc793e31f35c1873b3b11fa427d17e4e05f0e65 100644 (file)
@@ -4723,6 +4723,7 @@ retry:
                                                    EXT4_INODE_EOFBLOCKS);
                }
                ext4_mark_inode_dirty(handle, inode);
+               ext4_update_inode_fsync_trans(handle, inode, 1);
                ret2 = ext4_journal_stop(handle);
                if (ret2)
                        break;