From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 2/5] ufs: Convert ufs_extend_tail() to take a folio
Date: Sat, 5 Oct 2024 19:02:05 +0100 [thread overview]
Message-ID: <20241005180214.3181728-3-willy@infradead.org> (raw)
In-Reply-To: <20241005180214.3181728-1-willy@infradead.org>
Pass bh->b_folio instead of bh->b_page. They're in a union, so no
code change expected.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/ufs/inode.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index aad3bdd4422f..937d3b787d1e 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -220,7 +220,7 @@ static u64 ufs_frag_map(struct inode *inode, unsigned offsets[4], int depth)
*/
static bool
ufs_extend_tail(struct inode *inode, u64 writes_to,
- int *err, struct page *locked_page)
+ int *err, struct folio *locked_folio)
{
struct ufs_inode_info *ufsi = UFS_I(inode);
struct super_block *sb = inode->i_sb;
@@ -239,7 +239,7 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
p = ufs_get_direct_data_ptr(uspi, ufsi, block);
tmp = ufs_new_fragments(inode, p, lastfrag, ufs_data_ptr_to_cpu(sb, p),
new_size - (lastfrag & uspi->s_fpbmask), err,
- locked_page);
+ &locked_folio->page);
return tmp != 0;
}
@@ -433,7 +433,7 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff
unsigned tailfrags = lastfrag & uspi->s_fpbmask;
if (tailfrags && fragment >= lastfrag) {
if (!ufs_extend_tail(inode, fragment,
- &err, bh_result->b_page))
+ &err, bh_result->b_folio))
goto out;
}
}
--
2.43.0
next prev parent reply other threads:[~2024-10-05 18:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-05 18:02 [PATCH 0/5] UFS: Final folio conversions Matthew Wilcox (Oracle)
2024-10-05 18:02 ` [PATCH 1/5] ufs: Convert ufs_inode_getblock() to take a folio Matthew Wilcox (Oracle)
2024-10-05 18:02 ` Matthew Wilcox (Oracle) [this message]
2024-10-05 18:02 ` [PATCH 3/5] ufs: Convert ufs_inode_getfrag() " Matthew Wilcox (Oracle)
2024-10-05 18:02 ` [PATCH 4/5] ufs: Pass a folio to ufs_new_fragments() Matthew Wilcox (Oracle)
2024-10-05 18:02 ` [PATCH 5/5] ufs: Convert ufs_change_blocknr() to take a folio Matthew Wilcox (Oracle)
2024-10-05 18:31 ` [PATCH 0/5] UFS: Final folio conversions Al Viro
2024-10-05 21:21 ` Al Viro
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=20241005180214.3181728-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).