From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 05/33] fs: use ->is_partially_uptodate in page_cache_seek_hole_data
Date: Wed, 9 May 2018 09:48:02 +0200 [thread overview]
Message-ID: <20180509074830.16196-6-hch@lst.de> (raw)
In-Reply-To: <20180509074830.16196-1-hch@lst.de>
This way the implementation doesn't depend on buffer_head internals.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/iomap.c | 83 +++++++++++++++++++++++++++---------------------------
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/fs/iomap.c b/fs/iomap.c
index a739f3f995d9..b3592183b1a0 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -593,31 +593,54 @@ EXPORT_SYMBOL_GPL(iomap_fiemap);
*
* Returns the offset within the file on success, and -ENOENT otherwise.
*/
-static loff_t
-page_seek_hole_data(struct page *page, loff_t lastoff, int whence)
+static bool
+page_seek_hole_data(struct inode *inode, struct page *page, loff_t *lastoff,
+ int whence)
{
- loff_t offset = page_offset(page);
- struct buffer_head *bh, *head;
+ const struct address_space_operations *ops = inode->i_mapping->a_ops;
+ unsigned int bsize = i_blocksize(inode), off;
bool seek_data = whence == SEEK_DATA;
+ loff_t poff = page_offset(page);
- if (lastoff < offset)
- lastoff = offset;
-
- bh = head = page_buffers(page);
- do {
- offset += bh->b_size;
- if (lastoff >= offset)
- continue;
+ if (WARN_ON_ONCE(*lastoff >= poff + PAGE_SIZE))
+ return false;
+ if (*lastoff < poff) {
/*
- * Any buffer with valid data in it should have BH_Uptodate set.
+ * Last offset smaller than the start of the page means we found
+ * a hole:
*/
- if (buffer_uptodate(bh) == seek_data)
- return lastoff;
+ if (whence == SEEK_HOLE)
+ return true;
+ *lastoff = poff;
+ }
- lastoff = offset;
- } while ((bh = bh->b_this_page) != head);
- return -ENOENT;
+ /*
+ * Just check the page unless we can and should check block ranges:
+ */
+ if (bsize == PAGE_SIZE || !ops->is_partially_uptodate) {
+ if (PageUptodate(page) == seek_data)
+ return true;
+ return false;
+ }
+
+ lock_page(page);
+ if (unlikely(page->mapping != inode->i_mapping))
+ goto out_unlock_not_found;
+
+ for (off = 0; off < PAGE_SIZE; off += bsize) {
+ if ((*lastoff & ~PAGE_MASK) >= off + bsize)
+ continue;
+ if (ops->is_partially_uptodate(page, off, bsize) == seek_data) {
+ unlock_page(page);
+ return true;
+ }
+ *lastoff = poff + off + bsize;
+ }
+
+out_unlock_not_found:
+ unlock_page(page);
+ return false;
}
/*
@@ -654,30 +677,8 @@ page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
for (i = 0; i < nr_pages; i++) {
struct page *page = pvec.pages[i];
- /*
- * At this point, the page may be truncated or
- * invalidated (changing page->mapping to NULL), or
- * even swizzled back from swapper_space to tmpfs file
- * mapping. However, page->index will not change
- * because we have a reference on the page.
- *
- * If current page offset is beyond where we've ended,
- * we've found a hole.
- */
- if (whence == SEEK_HOLE &&
- lastoff < page_offset(page))
+ if (page_seek_hole_data(inode, page, &lastoff, whence))
goto check_range;
-
- lock_page(page);
- if (likely(page->mapping == inode->i_mapping) &&
- page_has_buffers(page)) {
- lastoff = page_seek_hole_data(page, lastoff, whence);
- if (lastoff >= 0) {
- unlock_page(page);
- goto check_range;
- }
- }
- unlock_page(page);
lastoff = page_offset(page) + PAGE_SIZE;
}
pagevec_release(&pvec);
--
2.17.0
next prev parent reply other threads:[~2018-05-09 7:48 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 7:47 stop using buffer heads in xfs and iomap Christoph Hellwig
2018-05-09 7:47 ` [PATCH 01/33] block: add a lower-level bio_add_page interface Christoph Hellwig
2018-05-09 15:12 ` Matthew Wilcox
2018-05-10 6:40 ` Christoph Hellwig
2018-05-10 21:49 ` Andreas Dilger
2018-05-11 6:29 ` Christoph Hellwig
2018-05-15 16:47 ` Jens Axboe
2018-05-10 8:52 ` Ming Lei
2018-05-11 6:24 ` Christoph Hellwig
2018-05-16 5:06 ` Ritesh Harjani
2018-05-16 18:05 ` Christoph Hellwig
2018-05-17 4:18 ` Ritesh Harjani
2018-05-09 7:47 ` [PATCH 02/33] fs: factor out a __generic_write_end helper Christoph Hellwig
2018-05-09 15:15 ` Matthew Wilcox
2018-05-10 6:40 ` Christoph Hellwig
2018-05-09 7:48 ` [PATCH 03/33] fs: move page_cache_seek_hole_data to iomap.c Christoph Hellwig
2018-05-09 7:48 ` [PATCH 04/33] fs: remove the buffer_unwritten check in page_seek_hole_data Christoph Hellwig
2018-05-17 11:33 ` Andreas Grünbacher
2018-05-09 7:48 ` Christoph Hellwig [this message]
2018-05-09 7:48 ` [PATCH 06/33] mm: give the 'ret' variable a better name __do_page_cache_readahead Christoph Hellwig
2018-05-09 15:45 ` Matthew Wilcox
2018-05-10 6:41 ` Christoph Hellwig
2018-05-09 7:48 ` [PATCH 07/33] mm: split ->readpages calls to avoid non-contiguous pages lists Christoph Hellwig
2018-05-09 15:46 ` Matthew Wilcox
2018-05-09 7:48 ` [PATCH 08/33] iomap: use __bio_add_page in iomap_dio_zero Christoph Hellwig
2018-05-09 7:48 ` [PATCH 09/33] iomap: add a iomap_sector helper Christoph Hellwig
2018-05-09 7:48 ` [PATCH 10/33] iomap: add an iomap-based bmap implementation Christoph Hellwig
2018-05-09 16:46 ` Darrick J. Wong
2018-05-10 6:42 ` Christoph Hellwig
2018-05-10 15:08 ` Darrick J. Wong
2018-05-11 6:25 ` Christoph Hellwig
2018-05-12 1:56 ` Darrick J. Wong
2018-05-09 7:48 ` [PATCH 11/33] iomap: add an iomap-based readpage and readpages implementation Christoph Hellwig
2018-05-10 1:17 ` Dave Chinner
2018-05-10 6:44 ` Christoph Hellwig
2018-05-09 7:48 ` [PATCH 12/33] xfs: use iomap_bmap Christoph Hellwig
2018-05-09 7:48 ` [PATCH 13/33] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Christoph Hellwig
2018-05-09 7:48 ` [PATCH 14/33] xfs: simplify xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-09 7:48 ` [PATCH 15/33] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-05-09 7:48 ` [PATCH 16/33] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-09 7:48 ` [PATCH 17/33] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-05-09 7:48 ` [PATCH 18/33] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-05-09 7:48 ` [PATCH 19/33] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-05-09 7:48 ` [PATCH 20/33] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-05-09 7:48 ` [PATCH 21/33] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-05-09 7:48 ` [PATCH 22/33] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-05-09 7:48 ` [PATCH 23/33] xfs: remove the imap_valid flag Christoph Hellwig
2018-05-09 7:48 ` [PATCH 24/33] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-05-09 7:48 ` [PATCH 25/33] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-05-09 7:48 ` [PATCH 26/33] xfs: allow writeback on pages without buffer heads Christoph Hellwig
2018-05-09 7:48 ` [PATCH 27/33] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-05-09 7:48 ` [PATCH 28/33] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-05-09 7:48 ` [PATCH 29/33] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-05-09 7:48 ` [PATCH 30/33] iomap: add initial support for writes without buffer heads Christoph Hellwig
2018-05-09 7:48 ` [PATCH 31/33] iomap: add support for sub-pagesize buffered I/O " Christoph Hellwig
2018-05-14 16:00 ` Goldwyn Rodrigues
2018-05-15 7:26 ` Christoph Hellwig
2018-05-15 13:47 ` Goldwyn Rodrigues
2018-05-16 5:46 ` Dave Chinner
2018-05-09 7:48 ` [PATCH 32/33] xfs: add support for sub-pagesize writeback without buffer_heads Christoph Hellwig
2018-05-09 7:48 ` [PATCH 33/33] fs: remove __block_write_begin and iomap_to_bh Christoph Hellwig
2018-05-10 15:13 ` stop using buffer heads in xfs and iomap Darrick J. Wong
2018-05-11 6:22 ` Christoph Hellwig
2018-05-11 6:39 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180509074830.16196-6-hch@lst.de \
--to=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).