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

Commit bd56b3e1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

fs: remove the buffer_unwritten check in page_seek_hole_data 



We only call into this function through the iomap iterators, so we already
know the buffer is unwritten.  In addition to that we always require the
uptodate flag that is ORed with the result anyway.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 8a78cb1f

fs/iomap.c

+4 −9
Original line number Diff line number Diff line
@@ -615,14 +615,9 @@ page_seek_hole_data(struct page *page, loff_t lastoff, int whence) 
			continue;



		/*

		 * Unwritten extents that have data in the page cache covering

		 * them can be identified by the BH_Unwritten state flag.

		 * Pages with multiple buffers might have a mix of holes, data

		 * and unwritten extents - any buffer with valid data in it

		 * should have BH_Uptodate flag set on it.

		 * Any buffer with valid data in it should have BH_Uptodate set.

		 */



		if ((buffer_unwritten(bh) || buffer_uptodate(bh)) == seek_data)

		if (buffer_uptodate(bh) == seek_data)

			return lastoff;



		lastoff = offset;
@@ -634,8 +629,8 @@ page_seek_hole_data(struct page *page, loff_t lastoff, int whence) 
 * Seek for SEEK_DATA / SEEK_HOLE in the page cache.

 *

 * Within unwritten extents, the page cache determines which parts are holes

 * and which are data: unwritten and uptodate buffer heads count as data;

 * everything else counts as a hole.

 * and which are data: uptodate buffer heads count as data; everything else

 * counts as a hole.

 *

 * Returns the resulting offset on successs, and -ENOENT otherwise.

 */