Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40665244 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v5.2.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fix from Andreas Gruenbacher:
 "Fix rounding error in gfs2_iomap_page_prepare"

* tag 'gfs2-v5.2.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix rounding error in gfs2_iomap_page_prepare
parents 1ed1fa5f 2741b672

fs/gfs2/bmap.c

+4 −1
Original line number Diff line number Diff line
@@ -991,9 +991,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,