Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: remove the buffer_unwritten check in page_seek_hole_data

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2018-06-01 09:05:14 -07:00 committed by Darrick J. Wong
parent 8a78cb1f1b
commit bd56b3e144
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/iomap.c
View File

@ -615,14 +615,9 @@ page_seek_hole_data(struct page *page, loff_t lastoff, int whence)
continue; continue;
/* /*
* Unwritten extents that have data in the page cache covering * Any buffer with valid data in it should have BH_Uptodate set.
* 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.
*/ */
if (buffer_uptodate(bh) == seek_data)
if ((buffer_unwritten(bh) || buffer_uptodate(bh)) == seek_data)
return lastoff; return lastoff;
lastoff = offset; 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. * Seek for SEEK_DATA / SEEK_HOLE in the page cache.
* *
* Within unwritten extents, the page cache determines which parts are holes * Within unwritten extents, the page cache determines which parts are holes
* and which are data: unwritten and uptodate buffer heads count as data; * and which are data: uptodate buffer heads count as data; everything else
* everything else counts as a hole. * counts as a hole.
* *
* Returns the resulting offset on successs, and -ENOENT otherwise. * Returns the resulting offset on successs, and -ENOENT otherwise.
*/ */