diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-06-19 15:10:55 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-19 15:10:55 -0700 |
| commit | 3d7b6b21f6c590c4d70b311bbdd78a214637c9c7 (patch) | |
| tree | e9600c462c27ea792440797d5218f66b623e8e49 /fs/buffer.c | |
| parent | a6d639da63aeb838d5c0b7dc50598f2eac4014a0 (diff) | |
| download | linux-stable-3d7b6b21f6c590c4d70b311bbdd78a214637c9c7.tar.gz linux-stable-3d7b6b21f6c590c4d70b311bbdd78a214637c9c7.tar.bz2 linux-stable-3d7b6b21f6c590c4d70b311bbdd78a214637c9c7.zip | |
iomap: mark newly allocated buffer heads as new
In iomap_to_bh, not only mark buffer heads in IOMAP_UNWRITTEN maps as
new, but also buffer heads in IOMAP_MAPPED maps with the IOMAP_F_NEW
flag set. This will be used by filesystems like gfs2, which allocate
blocks in iomap->begin.
Minor corrections to the comment for IOMAP_UNWRITTEN maps.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index aba2a948b235..c8c2b7d8b8d6 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1900,15 +1900,16 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, break; case IOMAP_UNWRITTEN: /* - * For unwritten regions, we always need to ensure that - * sub-block writes cause the regions in the block we are not - * writing to are zeroed. Set the buffer as new to ensure this. + * For unwritten regions, we always need to ensure that regions + * in the block we are not writing to are zeroed. Mark the + * buffer as new to ensure this. */ set_buffer_new(bh); set_buffer_unwritten(bh); /* FALLTHRU */ case IOMAP_MAPPED: - if (offset >= i_size_read(inode)) + if ((iomap->flags & IOMAP_F_NEW) || + offset >= i_size_read(inode)) set_buffer_new(bh); bh->b_blocknr = (iomap->addr + offset - iomap->offset) >> inode->i_blkbits; |