Patchwork [5/6,v5] ext4: fix fsx truncate failure

login
register
mail settings
Submitter Allison Henderson
Date Aug. 21, 2011, 2:29 a.m.
Message ID <1313893787-25460-6-git-send-email-achender@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/110797/
State Superseded
Headers show

Comments

Allison Henderson - Aug. 21, 2011, 2:29 a.m.
This patch corrects a bug found during extended fsx
testing for the first two patches.

This bug is caused because the truncate routine only zeros
the unblock aligned portion of the last page.  This means
that the block aligned portions of the page appearing after
i_size are left unzeroed, and the buffer heads still mapped.

This bug is corrected by using ext4_discard_partial_page_buffers
in the truncate routine to zero the partial page and unmap
the buffer headers

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
---
:100644 100644 b417e47... fe421bf... M	fs/ext4/extents.c
 fs/ext4/extents.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index b417e47..fe421bf 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3644,6 +3644,7 @@  void ext4_ext_truncate(struct inode *inode)
 	struct super_block *sb = inode->i_sb;
 	ext4_lblk_t last_block;
 	handle_t *handle;
+	loff_t page_len;
 	int err = 0;
 
 	/*
@@ -3660,8 +3661,16 @@  void ext4_ext_truncate(struct inode *inode)
 	if (IS_ERR(handle))
 		return;
 
-	if (inode->i_size & (sb->s_blocksize - 1))
-		ext4_block_truncate_page(handle, mapping, inode->i_size);
+	 if (inode->i_size % PAGE_CACHE_SIZE != 0) {
+
+		page_len = PAGE_CACHE_SIZE -
+			(inode->i_size & (PAGE_CACHE_SIZE - 1));
+
+		if (page_len >= sb->s_blocksize) {
+			ext4_discard_partial_page_buffers(handle,
+			mapping, inode->i_size, page_len, 0);
+		}
+	}
 
 	if (ext4_orphan_add(handle, inode))
 		goto out_stop;