diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2019-06-08 13:09:02 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2019-06-14 18:49:07 +0200 |
| commit | 2741b6723bf6f7d92d07c44bd6a09c6e37f3f949 (patch) | |
| tree | 08eb1d12ae5a2bd73fcb16112781e0cfd6a7a5d7 /fs | |
| parent | dc8ca9cc6e23054eb85599c9417ef2416848e7e8 (diff) | |
gfs2: Fix rounding error in gfs2_iomap_page_prepare
The pos and len arguments to the iomap page_prepare callback are not
block aligned, so we need to take that into account when computing the
number of blocks.
Fixes: d0a22a4b03b8 ("gfs2: Fix iomap write page reclaim deadlock")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/bmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index f42718dd292f..8bae7531e883 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -994,9 +994,12 @@ static void gfs2_write_unlock(struct inode *inode) static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, unsigned len, struct iomap *iomap) { + unsigned int blockmask = i_blocksize(inode) - 1; struct gfs2_sbd *sdp = GFS2_SB(inode); + unsigned int blocks; - return gfs2_trans_begin(sdp, RES_DINODE + (len >> inode->i_blkbits), 0); + blocks = ((pos & blockmask) + len + blockmask) >> inode->i_blkbits; + return gfs2_trans_begin(sdp, RES_DINODE + blocks, 0); } static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, |