Skip to contentSkip to conversation

ext4: fix ZERO_RANGE test failure in data journalling

PATCH Applied Namjae Jeon 2 participants 2 messages May 13, 2014 – May 26, 2014 ext4 file system

lore
Share & tools
lore

Namjae Jeon

author
#0 lore raw

PATCH 2/2 ext4: fix ZERO_RANGE test failure in data journalling

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 <[email protected]>
Signed-off-by Ashish Sangwan <[email protected]>
---
 fs/ext4/extents.c | 9 +++++++++
 1 file changed, 9 insertions(+)
fs/ext4/extents.c +9 -0
index 1c5e877..02143d6 100644
@@ -4743,6 +4743,15 @@ static long ext4_zero_range(struct file *file, loff_t offset,
 
 	mutex_lock(&EXT4_I(inode)->i_write_mutex);
 
+	/* 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) {
+			mutex_unlock(&EXT4_I(inode)->i_write_mutex);
+			return ret;
+		}
+	}
+
 	/*
 	 * Write out all dirty pages to avoid race conditions
 	 * Then release them.
Signature · 1 line
1.7.11-rc0