From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Dave Kleikamp <shaggy@kernel.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
jfs-discussion@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 10/13] jfs: Convert inc_io and mp_anchor to take a folio
Date: Thu, 1 Feb 2024 22:45:59 +0000 [thread overview]
Message-ID: <20240201224605.4055895-11-willy@infradead.org> (raw)
In-Reply-To: <20240201224605.4055895-1-willy@infradead.org>
All their callers now have a folio, so pass it in. No savings here,
just cleaning up some remnants.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/jfs/jfs_metapage.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 59729b9dd76f..bc62d4bb4712 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -78,7 +78,7 @@ struct meta_anchor {
atomic_t io_count;
struct metapage *mp[MPS_PER_PAGE];
};
-#define mp_anchor(page) ((struct meta_anchor *)page_private(page))
+#define mp_anchor(folio) (folio->private)
static inline struct metapage *folio_to_mp(struct folio *folio, int offset)
{
@@ -116,7 +116,7 @@ static inline int insert_metapage(struct folio *folio, struct metapage *mp)
static inline void remove_metapage(struct folio *folio, struct metapage *mp)
{
- struct meta_anchor *a = mp_anchor(&folio->page);
+ struct meta_anchor *a = mp_anchor(folio);
int l2mp_blocks = L2PSIZE - folio->mapping->host->i_blkbits;
int index;
@@ -132,9 +132,9 @@ static inline void remove_metapage(struct folio *folio, struct metapage *mp)
}
}
-static inline void inc_io(struct page *page)
+static inline void inc_io(struct folio *folio)
{
- atomic_inc(&mp_anchor(page)->io_count);
+ atomic_inc(&mp_anchor(folio)->io_count);
}
static inline void dec_io(struct folio *folio, void (*handler) (struct folio *))
@@ -166,7 +166,7 @@ static inline void remove_metapage(struct folio *folio, struct metapage *mp)
kunmap(&folio->page);
}
-#define inc_io(page) do {} while(0)
+#define inc_io(folio) do {} while(0)
#define dec_io(folio, handler) handler(folio)
#endif
@@ -395,14 +395,14 @@ static int metapage_write_folio(struct folio *folio,
* Increment counter before submitting i/o to keep
* count from hitting zero before we're through
*/
- inc_io(&folio->page);
+ inc_io(folio);
if (!bio->bi_iter.bi_size)
goto dump_bio;
submit_bio(bio);
nr_underway++;
bio = NULL;
} else
- inc_io(&folio->page);
+ inc_io(folio);
xlen = (folio_size(folio) - offset) >> inode->i_blkbits;
pblock = metapage_get_blocks(inode, lblock, &xlen);
if (!pblock) {
@@ -496,7 +496,7 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)
if (pblock) {
if (!folio->private)
insert_metapage(folio, NULL);
- inc_io(&folio->page);
+ inc_io(folio);
if (bio)
submit_bio(bio);
--
2.43.0
next prev parent reply other threads:[~2024-02-01 22:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 22:45 [PATCH 00/13] JFS folio conversion Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 01/13] jfs: Convert metapage_read_folio to use folio APIs Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 02/13] jfs: Convert metapage_writepage to metapage_write_folio Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 03/13] jfs: Convert __get_metapage to use a folio Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 04/13] jfs: Convert insert_metapage() to take " Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 05/13] jfs; Convert release_metapage to use " Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 06/13] jfs: Convert drop_metapage and remove_metapage to take " Matthew Wilcox (Oracle)
2024-02-02 17:18 ` kernel test robot
2024-02-05 11:29 ` kernel test robot
2024-02-01 22:45 ` [PATCH 07/13] jfs: Convert dec_io " Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 08/13] jfs; Convert __invalidate_metapages to use " Matthew Wilcox (Oracle)
2024-02-01 22:45 ` [PATCH 09/13] jfs: Convert page_to_mp to folio_to_mp Matthew Wilcox (Oracle)
2024-02-01 22:45 ` Matthew Wilcox (Oracle) [this message]
2024-02-03 1:53 ` [PATCH 10/13] jfs: Convert inc_io and mp_anchor to take a folio kernel test robot
2024-02-01 22:46 ` [PATCH 11/13] jfs: Convert force_metapage to use " Matthew Wilcox (Oracle)
2024-02-01 22:46 ` [PATCH 12/13] jfs: Change metapage->page to metapage->folio Matthew Wilcox (Oracle)
2024-02-01 22:46 ` [PATCH 13/13] fs: Remove i_blocks_per_page 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=20240201224605.4055895-11-willy@infradead.org \
--to=willy@infradead.org \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=shaggy@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: 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).