Skip to content

Commit d9c3600

Browse files
Matthew Wilcox (Oracle)kleikamp
authored andcommitted
jfs: Convert inc_io to take a folio
All their callers now have a folio, so pass it in. Remove mp_anchor() as inc_io() was the last user. No savings here, just cleaning up some remnants. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
1 parent 501bb98 commit d9c3600

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

fs/jfs/jfs_metapage.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ struct meta_anchor {
7878
atomic_t io_count;
7979
struct metapage *mp[MPS_PER_PAGE];
8080
};
81-
#define mp_anchor(page) ((struct meta_anchor *)page_private(page))
8281

8382
static inline struct metapage *folio_to_mp(struct folio *folio, int offset)
8483
{
@@ -132,9 +131,11 @@ static inline void remove_metapage(struct folio *folio, struct metapage *mp)
132131
}
133132
}
134133

135-
static inline void inc_io(struct page *page)
134+
static inline void inc_io(struct folio *folio)
136135
{
137-
atomic_inc(&mp_anchor(page)->io_count);
136+
struct meta_anchor *anchor = folio->private;
137+
138+
atomic_inc(&anchor->io_count);
138139
}
139140

140141
static inline void dec_io(struct folio *folio, void (*handler) (struct folio *))
@@ -166,7 +167,7 @@ static inline void remove_metapage(struct folio *folio, struct metapage *mp)
166167
kunmap(&folio->page);
167168
}
168169

169-
#define inc_io(page) do {} while(0)
170+
#define inc_io(folio) do {} while(0)
170171
#define dec_io(folio, handler) handler(folio)
171172

172173
#endif
@@ -395,14 +396,14 @@ static int metapage_write_folio(struct folio *folio,
395396
* Increment counter before submitting i/o to keep
396397
* count from hitting zero before we're through
397398
*/
398-
inc_io(&folio->page);
399+
inc_io(folio);
399400
if (!bio->bi_iter.bi_size)
400401
goto dump_bio;
401402
submit_bio(bio);
402403
nr_underway++;
403404
bio = NULL;
404405
} else
405-
inc_io(&folio->page);
406+
inc_io(folio);
406407
xlen = (folio_size(folio) - offset) >> inode->i_blkbits;
407408
pblock = metapage_get_blocks(inode, lblock, &xlen);
408409
if (!pblock) {
@@ -496,7 +497,7 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)
496497
if (pblock) {
497498
if (!folio->private)
498499
insert_metapage(folio, NULL);
499-
inc_io(&folio->page);
500+
inc_io(folio);
500501
if (bio)
501502
submit_bio(bio);
502503

0 commit comments

Comments
 (0)