| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.15 045/139] ext4: fix ZERO_RANGE test failure in data journalling | Date | Sat, 28 Jun 2014 10:46:46 -0700 |
| |
3.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <namjae.jeon@samsung.com>
commit e1ee60fd89670da61b0a4bda59f8ffb2b8abea63 upstream.
xfstests generic/091 is failing when mounting ext4 with data=journal. I think that this regression is same problem that occurred prior to collapse range issue. So ZERO RANGE also need to call ext4_force_commit as collapse range.
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- fs/ext4/extents.c | 7 +++++++ 1 file changed, 7 insertions(+)
--- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4744,6 +4744,13 @@ static long ext4_zero_range(struct file if (!S_ISREG(inode->i_mode)) return -EINVAL; + /* Call ext4_force_commit to flush all data in case of data=journal. */ + if (ext4_should_journal_data(inode)) { + ret = ext4_force_commit(inode->i_sb); + if (ret) + return ret; + } + /* * Write out all dirty pages to avoid race conditions * Then release them.
|