From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-mm@kvack.org, linux-block@vger.kernel.org,
"Darrick J . Wong" <djwong@kernel.org>
Subject: [PATCH v15 14/17] iomap: Convert iomap_read_inline_data to take a folio
Date: Mon, 19 Jul 2021 19:39:58 +0100 [thread overview]
Message-ID: <20210719184001.1750630-15-willy@infradead.org> (raw)
In-Reply-To: <20210719184001.1750630-1-willy@infradead.org>
Inline data is restricted to being less than a page in size, so we
don't need to handle multi-page folios.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/iomap/buffered-io.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 4b02337009bc..23ee86aba9d6 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -194,25 +194,25 @@ struct iomap_readpage_ctx {
struct readahead_control *rac;
};
-static void
-iomap_read_inline_data(struct inode *inode, struct page *page,
+static void iomap_read_inline_data(struct inode *inode, struct folio *folio,
struct iomap *iomap)
{
size_t size = i_size_read(inode);
void *addr;
- if (PageUptodate(page))
+ if (folio_test_uptodate(folio))
return;
- BUG_ON(page_has_private(page));
- BUG_ON(page->index);
+ BUG_ON(folio_test_private(folio));
+ BUG_ON(folio->index);
+ BUG_ON(folio_multi(folio));
BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));
- addr = kmap_atomic(page);
+ addr = kmap_local_folio(folio, 0);
memcpy(addr, iomap->inline_data, size);
memset(addr + size, 0, PAGE_SIZE - size);
- kunmap_atomic(addr);
- SetPageUptodate(page);
+ kunmap_local(addr);
+ folio_mark_uptodate(folio);
}
static inline bool iomap_block_needs_zeroing(struct inode *inode,
@@ -237,7 +237,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
if (iomap->type == IOMAP_INLINE) {
WARN_ON_ONCE(pos);
- iomap_read_inline_data(inode, &folio->page, iomap);
+ iomap_read_inline_data(inode, folio, iomap);
return PAGE_SIZE;
}
@@ -616,7 +616,7 @@ static int iomap_write_begin(struct inode *inode, loff_t pos, size_t len,
page = folio_file_page(folio, pos >> PAGE_SHIFT);
if (srcmap->type == IOMAP_INLINE)
- iomap_read_inline_data(inode, page, srcmap);
+ iomap_read_inline_data(inode, folio, srcmap);
else if (iomap->flags & IOMAP_F_BUFFER_HEAD)
status = __block_write_begin_int(page, pos, len, NULL, srcmap);
else
--
2.30.2
next prev parent reply other threads:[~2021-07-19 22:23 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 18:39 [PATCH v15 00/17] Folio support in block + iomap layers Matthew Wilcox (Oracle)
2021-07-19 18:39 ` [PATCH v15 01/17] block: Add bio_add_folio() Matthew Wilcox (Oracle)
2021-07-20 1:28 ` Darrick J. Wong
2021-07-20 6:42 ` Christoph Hellwig
2021-07-20 11:16 ` Matthew Wilcox
2021-07-22 16:27 ` Matthew Wilcox
2021-07-30 8:25 ` Ming Lei
2021-07-30 11:30 ` Matthew Wilcox
2021-07-19 18:39 ` [PATCH v15 02/17] block: Add bio_for_each_folio_all() Matthew Wilcox (Oracle)
2021-07-20 1:29 ` Darrick J. Wong
2021-07-20 1:59 ` Matthew Wilcox
2021-07-20 6:48 ` Christoph Hellwig
2021-07-23 2:40 ` Matthew Wilcox
2021-07-20 12:05 ` kernel test robot
2021-07-20 12:05 ` kernel test robot
2021-07-20 12:26 ` kernel test robot
2021-07-19 18:39 ` [PATCH v15 03/17] iomap: Convert to_iomap_page to take a folio Matthew Wilcox (Oracle)
2021-07-20 6:49 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 04/17] iomap: Convert iomap_page_create " Matthew Wilcox (Oracle)
2021-07-20 6:50 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 05/17] iomap: Convert iomap_page_release " Matthew Wilcox (Oracle)
2021-07-20 6:52 ` Christoph Hellwig
2021-07-20 11:29 ` Matthew Wilcox
2021-07-20 11:40 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 06/17] iomap: Convert iomap_releasepage to use " Matthew Wilcox (Oracle)
2021-07-20 6:54 ` Christoph Hellwig
2021-07-20 23:56 ` Darrick J. Wong
2021-07-19 18:39 ` [PATCH v15 07/17] iomap: Convert iomap_invalidatepage " Matthew Wilcox (Oracle)
2021-07-20 6:55 ` Christoph Hellwig
2021-07-20 23:57 ` Darrick J. Wong
2021-07-19 18:39 ` [PATCH v15 08/17] iomap: Pass the iomap_page into iomap_set_range_uptodate Matthew Wilcox (Oracle)
2021-07-20 6:57 ` Christoph Hellwig
2021-07-20 11:36 ` Matthew Wilcox
2021-07-19 18:39 ` [PATCH v15 09/17] iomap: Use folio offsets instead of page offsets Matthew Wilcox (Oracle)
2021-07-20 6:59 ` Christoph Hellwig
2021-07-20 11:42 ` Matthew Wilcox
2021-07-19 18:39 ` [PATCH v15 10/17] iomap: Convert bio completions to use folios Matthew Wilcox (Oracle)
2021-07-20 7:08 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 11/17] iomap: Convert readahead and readpage to use a folio Matthew Wilcox (Oracle)
2021-07-20 7:09 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 12/17] iomap: Convert iomap_page_mkwrite " Matthew Wilcox (Oracle)
2021-07-20 7:13 ` Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 13/17] iomap: Convert iomap_write_begin and iomap_write_end to folios Matthew Wilcox (Oracle)
2021-07-20 7:15 ` Christoph Hellwig
2021-07-20 23:59 ` Darrick J. Wong
2021-07-19 18:39 ` Matthew Wilcox (Oracle) [this message]
2021-07-20 7:16 ` [PATCH v15 14/17] iomap: Convert iomap_read_inline_data to take a folio Christoph Hellwig
2021-07-19 18:39 ` [PATCH v15 15/17] iomap: Convert iomap_write_end_inline " Matthew Wilcox (Oracle)
2021-07-20 7:17 ` Christoph Hellwig
2021-07-19 18:40 ` [PATCH v15 16/17] iomap: Convert iomap_add_to_ioend " Matthew Wilcox (Oracle)
2021-07-20 7:20 ` Christoph Hellwig
2021-07-20 11:45 ` Matthew Wilcox
2021-07-21 0:12 ` Darrick J. Wong
2021-07-21 4:27 ` Christoph Hellwig
2021-07-21 4:31 ` Matthew Wilcox
2021-07-21 15:28 ` Darrick J. Wong
2021-07-19 18:40 ` [PATCH v15 17/17] iomap: Convert iomap_migrate_page to use folios Matthew Wilcox (Oracle)
2021-07-20 7:21 ` Christoph Hellwig
2021-07-20 13:30 ` kernel test robot
2021-07-21 0:02 ` Darrick J. Wong
2021-07-20 8:44 ` [PATCH v15 00/17] Folio support in block + iomap layers Christoph Hellwig
2021-07-20 11:08 ` 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=20210719184001.1750630-15-willy@infradead.org \
--to=willy@infradead.org \
--cc=djwong@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.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).