提交 009d8d84 编写于 作者: C Christoph Hellwig 提交者: Darrick J. Wong

iomap: zero newly allocated mapped blocks

File systems like gfs2 don't support delayed allocations or unwritten
extents and thus allocate normal mapped blocks to fill holes.  To
cover the case of such file systems allocating new blocks to fill holes
also zero out mapped blocks with the new flag.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NDave Chinner <dchinner@redhat.com>
Reviewed-by: NDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: NDarrick J. Wong <darrick.wong@oracle.com>
上级 760fea8b
...@@ -203,6 +203,14 @@ iomap_read_inline_data(struct inode *inode, struct page *page, ...@@ -203,6 +203,14 @@ iomap_read_inline_data(struct inode *inode, struct page *page,
SetPageUptodate(page); SetPageUptodate(page);
} }
static inline bool iomap_block_needs_zeroing(struct inode *inode,
struct iomap *iomap, loff_t pos)
{
return iomap->type != IOMAP_MAPPED ||
(iomap->flags & IOMAP_F_NEW) ||
pos >= i_size_read(inode);
}
static loff_t static loff_t
iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
struct iomap *iomap) struct iomap *iomap)
...@@ -226,7 +234,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, ...@@ -226,7 +234,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
if (plen == 0) if (plen == 0)
goto done; goto done;
if (iomap->type != IOMAP_MAPPED || pos >= i_size_read(inode)) { if (iomap_block_needs_zeroing(inode, iomap, pos)) {
zero_user(page, poff, plen); zero_user(page, poff, plen);
iomap_set_range_uptodate(page, poff, plen); iomap_set_range_uptodate(page, poff, plen);
goto done; goto done;
...@@ -532,7 +540,7 @@ iomap_read_page_sync(struct inode *inode, loff_t block_start, struct page *page, ...@@ -532,7 +540,7 @@ iomap_read_page_sync(struct inode *inode, loff_t block_start, struct page *page,
struct bio_vec bvec; struct bio_vec bvec;
struct bio bio; struct bio bio;
if (iomap->type != IOMAP_MAPPED || block_start >= i_size_read(inode)) { if (iomap_block_needs_zeroing(inode, iomap, block_start)) {
zero_user_segments(page, poff, from, to, poff + plen); zero_user_segments(page, poff, from, to, poff + plen);
iomap_set_range_uptodate(page, poff, plen); iomap_set_range_uptodate(page, poff, plen);
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册