From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org, linux-cifs@vger.kernel.org, ecryptfs@vger.kernel.org, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, Richard Weinberger <richard@nod.at>, linux-xfs@vger.kernel.org Subject: [PATCH v2 15/16] iomap: Inline iomap_iop_set_range_uptodate into its one caller Date: Fri, 9 Oct 2020 15:31:03 +0100 [thread overview] Message-ID: <20201009143104.22673-16-willy@infradead.org> (raw) In-Reply-To: <20201009143104.22673-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 8180061b9e16..e60f572e1590 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -141,8 +141,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; @@ -150,6 +150,14 @@ iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len) unsigned last = (off + len - 1) >> inode->i_blkbits; unsigned long flags; + if (PageError(page)) + return; + + if (!iop) { + SetPageUptodate(page); + return; + } + spin_lock_irqsave(&iop->uptodate_lock, flags); bitmap_set(iop->uptodate, first, last - first + 1); if (bitmap_full(iop->uptodate, i_blocks_per_page(inode, page))) @@ -157,18 +165,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_page_end_io(struct bio_vec *bvec, int error) { -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: linux-cifs@vger.kernel.org, Richard Weinberger <richard@nod.at>, ecryptfs@vger.kernel.org, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, "Matthew Wilcox \(Oracle\)" <willy@infradead.org>, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-mtd@lists.infradead.org, v9fs-developer@lists.sourceforge.net, ceph-devel@vger.kernel.org, linux-afs@lists.infradead.org Subject: [PATCH v2 15/16] iomap: Inline iomap_iop_set_range_uptodate into its one caller Date: Fri, 9 Oct 2020 15:31:03 +0100 [thread overview] Message-ID: <20201009143104.22673-16-willy@infradead.org> (raw) In-Reply-To: <20201009143104.22673-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 8180061b9e16..e60f572e1590 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -141,8 +141,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; @@ -150,6 +150,14 @@ iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len) unsigned last = (off + len - 1) >> inode->i_blkbits; unsigned long flags; + if (PageError(page)) + return; + + if (!iop) { + SetPageUptodate(page); + return; + } + spin_lock_irqsave(&iop->uptodate_lock, flags); bitmap_set(iop->uptodate, first, last - first + 1); if (bitmap_full(iop->uptodate, i_blocks_per_page(inode, page))) @@ -157,18 +165,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_page_end_io(struct bio_vec *bvec, int error) { -- 2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-10-09 14:31 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-09 14:30 [PATCH v2 00/16] Allow readpage to return a locked page Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 01/16] mm: Add AOP_UPDATED_PAGE return value Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-15 9:06 ` Christoph Hellwig 2020-10-15 9:06 ` Christoph Hellwig 2020-10-15 9:06 ` Christoph Hellwig 2020-10-15 14:06 ` Matthew Wilcox 2020-10-15 14:06 ` Matthew Wilcox 2020-10-15 14:06 ` Matthew Wilcox 2020-10-09 14:30 ` [PATCH v2 02/16] mm: Inline wait_on_page_read into its one caller Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-15 9:08 ` Christoph Hellwig 2020-10-15 9:08 ` Christoph Hellwig 2020-10-09 14:30 ` [PATCH v2 03/16] 9p: Tell the VFS that readpage was synchronous Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 04/16] afs: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 05/16] ceph: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 06/16] cifs: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 07/16] cramfs: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 08/16] ecryptfs: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 09/16] fuse: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 10/16] hostfs: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` [PATCH v2 11/16] jffs2: " Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:30 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` [PATCH v2 12/16] ubifs: " Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` [PATCH v2 13/16] udf: " Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` [PATCH v2 14/16] vboxsf: " Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) [this message] 2020-10-09 14:31 ` [PATCH v2 15/16] iomap: Inline iomap_iop_set_range_uptodate into its one caller Matthew Wilcox (Oracle) 2020-10-15 9:08 ` Christoph Hellwig 2020-10-15 9:08 ` Christoph Hellwig 2020-10-15 9:08 ` Christoph Hellwig 2020-10-09 14:31 ` [PATCH v2 16/16] iomap: Make readpage synchronous Matthew Wilcox (Oracle) 2020-10-09 14:31 ` Matthew Wilcox (Oracle) 2020-10-15 9:42 ` Christoph Hellwig 2020-10-15 9:42 ` Christoph Hellwig 2020-10-15 9:42 ` Christoph Hellwig 2020-10-15 16:43 ` Matthew Wilcox 2020-10-15 16:43 ` Matthew Wilcox 2020-10-15 16:43 ` Matthew Wilcox 2020-10-15 17:58 ` Christoph Hellwig 2020-10-15 17:58 ` Christoph Hellwig 2020-10-15 17:58 ` Christoph Hellwig 2020-10-15 19:03 ` Matthew Wilcox 2020-10-15 19:03 ` Matthew Wilcox 2020-10-15 19:03 ` Matthew Wilcox 2020-10-16 6:35 ` Christoph Hellwig 2020-10-16 6:35 ` Christoph Hellwig 2020-10-16 6:35 ` Christoph Hellwig 2020-10-15 9:02 ` [PATCH v2 00/16] Allow readpage to return a locked page Christoph Hellwig 2020-10-15 9:02 ` Christoph Hellwig 2020-10-15 9:02 ` Christoph Hellwig 2020-10-15 11:49 ` Matthew Wilcox 2020-10-15 11:49 ` Matthew Wilcox 2020-10-15 11:49 ` Matthew Wilcox
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=20201009143104.22673-16-willy@infradead.org \ --to=willy@infradead.org \ --cc=ceph-devel@vger.kernel.org \ --cc=ecryptfs@vger.kernel.org \ --cc=linux-afs@lists.infradead.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-um@lists.infradead.org \ --cc=linux-xfs@vger.kernel.org \ --cc=richard@nod.at \ --cc=v9fs-developer@lists.sourceforge.net \ /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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.