From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH 6/7] minixfs: Convert minix_prepare_chunk() to take a folio
Date: Wed, 10 Jul 2024 02:23:20 +0100 [thread overview]
Message-ID: <20240710012323.2039519-7-willy@infradead.org> (raw)
In-Reply-To: <20240710012323.2039519-1-willy@infradead.org>
All callers now have a folio, so convert minix_prepare_chunk() to
take one.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/minix/dir.c | 8 ++++----
fs/minix/inode.c | 4 ++--
fs/minix/minix.h | 24 ++++++++++++------------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 15b3ef1e473c..26bfea508028 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -260,7 +260,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)
got_it:
pos = folio_pos(folio) + offset_in_folio(folio, p);
- err = minix_prepare_chunk(&folio->page, pos, sbi->s_dirsize);
+ err = minix_prepare_chunk(folio, pos, sbi->s_dirsize);
if (err)
goto out_unlock;
memcpy (namx, name, namelen);
@@ -292,7 +292,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct folio *folio)
int err;
folio_lock(folio);
- err = minix_prepare_chunk(&folio->page, pos, len);
+ err = minix_prepare_chunk(folio, pos, len);
if (err) {
folio_unlock(folio);
return err;
@@ -316,7 +316,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)
if (IS_ERR(folio))
return PTR_ERR(folio);
- err = minix_prepare_chunk(&folio->page, 0, 2 * sbi->s_dirsize);
+ err = minix_prepare_chunk(folio, 0, 2 * sbi->s_dirsize);
if (err) {
folio_unlock(folio);
goto fail;
@@ -413,7 +413,7 @@ int minix_set_link(struct minix_dir_entry *de, struct folio *folio,
int err;
folio_lock(folio);
- err = minix_prepare_chunk(&folio->page, pos, sbi->s_dirsize);
+ err = minix_prepare_chunk(folio, pos, sbi->s_dirsize);
if (err) {
folio_unlock(folio);
return err;
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 1c3df63162ef..0002337977e0 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -427,9 +427,9 @@ static int minix_read_folio(struct file *file, struct folio *folio)
return block_read_full_folio(folio, minix_get_block);
}
-int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len)
+int minix_prepare_chunk(struct folio *folio, loff_t pos, unsigned len)
{
- return __block_write_begin(page, pos, len, minix_get_block);
+ return __block_write_begin(&folio->page, pos, len, minix_get_block);
}
static void minix_write_failed(struct address_space *mapping, loff_t to)
diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index 063bab8faa6b..d54273c3c9ff 100644
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -42,18 +42,18 @@ struct minix_sb_info {
unsigned short s_version;
};
-extern struct inode *minix_iget(struct super_block *, unsigned long);
-extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
-extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
-extern struct inode * minix_new_inode(const struct inode *, umode_t);
-extern void minix_free_inode(struct inode * inode);
-extern unsigned long minix_count_free_inodes(struct super_block *sb);
-extern int minix_new_block(struct inode * inode);
-extern void minix_free_block(struct inode *inode, unsigned long block);
-extern unsigned long minix_count_free_blocks(struct super_block *sb);
-extern int minix_getattr(struct mnt_idmap *, const struct path *,
- struct kstat *, u32, unsigned int);
-extern int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len);
+struct inode *minix_iget(struct super_block *, unsigned long);
+struct minix_inode *minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
+struct minix2_inode *minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
+struct inode *minix_new_inode(const struct inode *, umode_t);
+void minix_free_inode(struct inode *inode);
+unsigned long minix_count_free_inodes(struct super_block *sb);
+int minix_new_block(struct inode *inode);
+void minix_free_block(struct inode *inode, unsigned long block);
+unsigned long minix_count_free_blocks(struct super_block *sb);
+int minix_getattr(struct mnt_idmap *, const struct path *,
+ struct kstat *, u32, unsigned int);
+int minix_prepare_chunk(struct folio *folio, loff_t pos, unsigned len);
extern void V1_minix_truncate(struct inode *);
extern void V2_minix_truncate(struct inode *);
--
2.43.0
next prev parent reply other threads:[~2024-07-10 1:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 1:23 [PATCH 0/7] Convert minixfs directory handling to folios Matthew Wilcox (Oracle)
2024-07-10 1:23 ` [PATCH 1/7] minixfs: Convert dir_get_page() to dir_get_folio() Matthew Wilcox (Oracle)
2024-07-10 1:23 ` [PATCH 2/7] minixfs: Convert minix_find_entry() to take a folio Matthew Wilcox (Oracle)
2024-07-10 1:23 ` [PATCH 3/7] minifs: Convert minix_set_link() and minix_dotdot() " Matthew Wilcox (Oracle)
2024-07-10 1:23 ` [PATCH 4/7] minixfs: Convert minix_delete_entry() to work on " Matthew Wilcox (Oracle)
2024-07-10 1:23 ` [PATCH 5/7] minixfs: Convert minix_make_empty() to use " Matthew Wilcox (Oracle)
2024-07-10 1:23 ` Matthew Wilcox (Oracle) [this message]
2024-07-10 1:23 ` [PATCH 7/7] minixfs: Convert dir_commit_chunk() to take " Matthew Wilcox (Oracle)
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=20240710012323.2039519-7-willy@infradead.org \
--to=willy@infradead.org \
--cc=hch@lst.de \
--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).