Merge tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

torvalds · torvalds · commit ea9b5ee31078 · 2018-03-07T12:01:45.000-08:00
Pull gfs2 fix from Bob Peterson:
 "An additional patch from Andreas Gruenbacher that fixes another
  unfortunate GFS2 regression"

* tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fixes to "Implement iomap for block_map" (2)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
@@ -807,9 +807,6 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
 			iomap->length = hole_size(inode, lblock, &mp);
 		else
 			iomap->length = size - pos;
-	} else {
-		if (height <= ip->i_height)
-			iomap->length = hole_size(inode, lblock, &mp);
 	}
 	goto out_release;
 }

Original file line number	Diff line number	Diff line change
`@@ -807,9 +807,6 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,`
`807`	`807`	`iomap->length = hole_size(inode, lblock, &mp);`
`808`	`808`	`else`
`809`	`809`	`iomap->length = size - pos;`
`810`		`- } else {`
`811`		`- if (height <= ip->i_height)`
`812`		`- iomap->length = hole_size(inode, lblock, &mp);`
`813`	`810`	`}`
`814`	`811`	`goto out_release;`
`815`	`812`	`}`