gfs2: Fix rounding error in gfs2_iomap_page_prepare (2741b672) · Commits · 戴 / test

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: ("gfs2: Fix iomap write page reclaim deadlock") Signed-off-by:

Andreas Gruenbacher <agruenba@redhat.com>

fs/gfs2/bmap.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message