Linux-Fsdevel Archive on lore.kernel.org help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-xfs@vger.kernel.org Subject: [PATCH 14/13] iomap: Inline iomap_iop_set_range_uptodate into its one caller Date: Thu, 17 Sep 2020 23:56:45 +0100 [thread overview] Message-ID: <20200917225647.26481-1-willy@infradead.org> (raw) In-Reply-To: <20200917151050.5363-1-willy@infradead.org> iomap_set_range_uptodate() is the only caller of iomap_iop_set_range_uptodate() and it makes future patches easier to have it inline. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- fs/iomap/buffered-io.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 897ab9a26a74..2a6492b3c4db 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -135,8 +135,8 @@ iomap_adjust_read_range(struct inode *inode, struct iomap_page *iop, *lenp = plen; } -static void -iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len) +static +void iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len) { struct iomap_page *iop = to_iomap_page(page); struct inode *inode = page->mapping->host; @@ -146,6 +146,14 @@ iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len) unsigned long flags; unsigned int i; + if (PageError(page)) + return; + + if (!iop) { + SetPageUptodate(page); + return; + } + spin_lock_irqsave(&iop->uptodate_lock, flags); for (i = 0; i < PAGE_SIZE / i_blocksize(inode); i++) { if (i >= first && i <= last) @@ -159,18 +167,6 @@ iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len) spin_unlock_irqrestore(&iop->uptodate_lock, flags); } -static void -iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len) -{ - if (PageError(page)) - return; - - if (page_has_private(page)) - iomap_iop_set_range_uptodate(page, off, len); - else - SetPageUptodate(page); -} - static void iomap_read_finish(struct iomap_page *iop, struct page *page) { -- 2.28.0
next prev parent reply other threads:[~2020-09-17 22:56 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-17 15:10 [PATCH 00/13] Allow readpage to return a locked page Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 01/13] mm: Add AOP_UPDATED_PAGE return value Matthew Wilcox (Oracle) 2020-09-17 22:03 ` Matthew Wilcox 2020-09-17 15:10 ` [PATCH 02/13] 9p: Tell the VFS that readpage was synchronous Matthew Wilcox (Oracle) 2020-09-18 5:59 ` [V9fs-developer] " Dominique Martinet 2020-09-18 11:19 ` Matthew Wilcox 2020-09-18 12:30 ` Dominique Martinet 2020-09-17 15:10 ` [PATCH 03/13] afs: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 04/13] ceph: " Matthew Wilcox (Oracle) 2020-09-17 16:49 ` Jeff Layton 2020-09-17 15:10 ` [PATCH 05/13] cifs: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 06/13] cramfs: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 07/13] ecryptfs: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 08/13] fuse: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 09/13] hostfs: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 10/13] jffs2: " Matthew Wilcox (Oracle) 2020-09-17 15:10 ` [PATCH 11/13] ubifs: " Matthew Wilcox (Oracle) 2020-09-17 20:46 ` Richard Weinberger 2020-09-17 15:10 ` [PATCH 12/13] udf: " Matthew Wilcox (Oracle) 2020-09-24 9:00 ` Jan Kara 2020-09-17 15:10 ` [PATCH 13/13] vboxsf: " Matthew Wilcox (Oracle) 2020-09-17 22:56 ` Matthew Wilcox (Oracle) [this message] 2020-09-17 22:56 ` [PATCH 15/13] iomap: Inline iomap_read_finish into its one caller Matthew Wilcox (Oracle) 2020-09-19 6:31 ` Christoph Hellwig 2020-09-17 22:56 ` [PATCH 16/13] iomap: Make readpage synchronous Matthew Wilcox (Oracle) 2020-09-19 6:39 ` Christoph Hellwig 2020-09-19 6:43 ` Christoph Hellwig 2020-09-19 17:03 ` Matthew Wilcox 2020-09-19 17:10 ` Matthew Wilcox 2020-09-19 6:31 ` [PATCH 14/13] iomap: Inline iomap_iop_set_range_uptodate into its one caller Christoph Hellwig
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=20200917225647.26481-1-willy@infradead.org \ --to=willy@infradead.org \ --cc=linux-fsdevel@vger.kernel.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: linkBe 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).