Commit c7c14a36 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

ocfs2: do not zero pages beyond i_size

ocfs2_zero_range_for_truncate() can try to zero pages beyond current
inode size despite the fact that underlying blocks should be already
zeroed out and writeback will skip writing such pages anyway.  Avoid the
pointless work.

Link: https://lkml.kernel.org/r/20211025151332.11301-2-jack@suse.czSigned-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 839b6386
...@@ -6923,13 +6923,12 @@ static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end, ...@@ -6923,13 +6923,12 @@ static int ocfs2_grab_eof_pages(struct inode *inode, loff_t start, loff_t end,
} }
/* /*
* Zero the area past i_size but still within an allocated * Zero partial cluster for a hole punch or truncate. This avoids exposing
* cluster. This avoids exposing nonzero data on subsequent file * nonzero data on subsequent file extends.
* extends.
* *
* We need to call this before i_size is updated on the inode because * We need to call this before i_size is updated on the inode because
* otherwise block_write_full_page() will skip writeout of pages past * otherwise block_write_full_page() will skip writeout of pages past
* i_size. The new_i_size parameter is passed for this reason. * i_size.
*/ */
int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle, int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,
u64 range_start, u64 range_end) u64 range_start, u64 range_end)
...@@ -6947,6 +6946,15 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle, ...@@ -6947,6 +6946,15 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,
if (!ocfs2_sparse_alloc(OCFS2_SB(sb))) if (!ocfs2_sparse_alloc(OCFS2_SB(sb)))
return 0; return 0;
/*
* Avoid zeroing pages fully beyond current i_size. It is pointless as
* underlying blocks of those pages should be already zeroed out and
* page writeback will skip them anyway.
*/
range_end = min_t(u64, range_end, i_size_read(inode));
if (range_start >= range_end)
return 0;
pages = kcalloc(ocfs2_pages_per_cluster(sb), pages = kcalloc(ocfs2_pages_per_cluster(sb),
sizeof(struct page *), GFP_NOFS); sizeof(struct page *), GFP_NOFS);
if (pages == NULL) { if (pages == NULL) {
...@@ -6955,9 +6963,6 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle, ...@@ -6955,9 +6963,6 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,
goto out; goto out;
} }
if (range_start == range_end)
goto out;
ret = ocfs2_extent_map_get_blocks(inode, ret = ocfs2_extent_map_get_blocks(inode,
range_start >> sb->s_blocksize_bits, range_start >> sb->s_blocksize_bits,
&phys, NULL, &ext_flags); &phys, NULL, &ext_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment