From: Goldwyn Rodrigues Date: Thu, 17 Feb 2011 15:44:40 +0000 (-0600) Subject: Treat writes as new when holes span across page boundaries X-Git-Tag: v2.6.32.37~36 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6216277c085f263225cfb97a8b2fc869e5418fb1;p=karo-tx-linux.git Treat writes as new when holes span across page boundaries commit 272b62c1f0f6f742046e45b50b6fec98860208a0 upstream. When a hole spans across page boundaries, the next write forces a read of the block. This could end up reading existing garbage data from the disk in ocfs2_map_page_blocks. This leads to non-zero holes. In order to avoid this, mark the writes as new when the holes span across page boundaries. Signed-off-by: Goldwyn Rodrigues Signed-off-by: jlbec Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 5fc918ca2572..35d256b5add2 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1091,6 +1091,12 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno, ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos, &cluster_start, &cluster_end); + /* treat the write as new if the a hole/lseek spanned across + * the page boundary. + */ + new = new | ((i_size_read(inode) <= page_offset(page)) && + (page_offset(page) <= user_pos)); + if (page == wc->w_target_page) { map_from = user_pos & (PAGE_CACHE_SIZE - 1); map_to = map_from + user_len;