@@ -4786,26 +4786,6 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length)
}
}
-
- /*
- * If i_size is contained in the last page, we need to
- * unmap and zero the partial page after i_size
- */
- if (inode->i_size >> PAGE_CACHE_SHIFT == last_page &&
- inode->i_size % PAGE_CACHE_SIZE != 0) {
-
- page_len = PAGE_CACHE_SIZE -
- (inode->i_size & (PAGE_CACHE_SIZE - 1));
-
- if (page_len > 0) {
- err = ext4_discard_partial_page_buffers(handle,
- mapping, inode->i_size, page_len, 0);
-
- if (err)
- goto out;
- }
- }
-
/* If there are no blocks to remove, return now */
if (first_block >= last_block)
goto out;
This patch removes a fix that is now being addressed in another patch. The code being removed also made the assumption that a hole cannot exceed or start after i_size, but since this is no longer the case and the source of the bug has been corrected in a different patch, this code is no longer needed. The removed code initally corrected a bug found in fsx, where garbage data would appear in the last page after i_size, when ever a hole ended in the same page as i_size. The cause of the cause of the garbage data has been fixed in patch "[PATCH 2/2] ext4: let ext4_bio_write_page handle EOF correctly" This patch set has been tested with fsx on a 1k block size, and successfully passed 24 hours. Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com> --- :100644 100644 9ec6249... e607880... M fs/ext4/extents.c fs/ext4/extents.c | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-)