Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

jfs: Convert insert_metapage() to take a folio

Browse Source 
Both of its callers now have a folio, so convert this function.
Use folio_attach_private() instead of manually setting folio->private.
This also gets the expected refcount of the folio correct.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-04-17 18:56:48 +01:00 committed by Dave Kleikamp
parent 2dcd9630d9
commit 9346476d21
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fs/jfs/jfs_metapage.c
View File

@ -87,25 +87,23 @@ static inline struct metapage *page_to_mp(struct page *page, int offset)
return mp_anchor(page)->mp[offset >> L2PSIZE]; return mp_anchor(page)->mp[offset >> L2PSIZE];
} }
static inline int insert_metapage(struct page *page, struct metapage *mp) static inline int insert_metapage(struct folio *folio, struct metapage *mp)
{ {
struct meta_anchor *a; struct meta_anchor *a;
int index; int index;
int l2mp_blocks; /* log2 blocks per metapage */ int l2mp_blocks; /* log2 blocks per metapage */
if (PagePrivate(page)) a = folio->private;
a = mp_anchor(page); if (!a) {
else {
a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS); a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS);
if (!a) if (!a)
return -ENOMEM; return -ENOMEM;
set_page_private(page, (unsigned long)a); folio_attach_private(folio, a);
SetPagePrivate(page); kmap(&folio->page);
kmap(page);
} }
if (mp) { if (mp) {
l2mp_blocks = L2PSIZE - page->mapping->host->i_blkbits; l2mp_blocks = L2PSIZE - folio->mapping->host->i_blkbits;
index = (mp->index >> l2mp_blocks) & (MPS_PER_PAGE - 1); index = (mp->index >> l2mp_blocks) & (MPS_PER_PAGE - 1);
a->mp_count++; a->mp_count++;
a->mp[index] = mp; a->mp[index] = mp;
@ -127,8 +125,7 @@ static inline void remove_metapage(struct page *page, struct metapage *mp)
a->mp[index] = NULL; a->mp[index] = NULL;
if (--a->mp_count == 0) { if (--a->mp_count == 0) {
kfree(a); kfree(a);
set_page_private(page, 0); detach_page_private(page);
ClearPagePrivate(page);
kunmap(page); kunmap(page);
} }
} }
@ -150,20 +147,18 @@ static inline struct metapage *page_to_mp(struct page *page, int offset)
return PagePrivate(page) ? (struct metapage *)page_private(page) : NULL; return PagePrivate(page) ? (struct metapage *)page_private(page) : NULL;
} }
static inline int insert_metapage(struct page *page, struct metapage *mp) static inline int insert_metapage(struct folio *folio, struct metapage *mp)
{ {
if (mp) { if (mp) {
set_page_private(page, (unsigned long)mp); folio_attach_private(folio, mp);
SetPagePrivate(page); kmap(&folio->page);
kmap(page);
} }
return 0; return 0;
} }
static inline void remove_metapage(struct page *page, struct metapage *mp) static inline void remove_metapage(struct page *page, struct metapage *mp)
{ {
set_page_private(page, 0); detach_page_private(page);
ClearPagePrivate(page);
kunmap(page); kunmap(page);
} }
@ -496,7 +491,7 @@ static int metapage_read_folio(struct file *fp, struct folio *folio)
&xlen); &xlen);
if (pblock) { if (pblock) {
if (!folio->private) if (!folio->private)
insert_metapage(&folio->page, NULL); insert_metapage(folio, NULL);
inc_io(&folio->page); inc_io(&folio->page);
if (bio) if (bio)
submit_bio(bio); submit_bio(bio);
@ -658,7 +653,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
mp->logical_size = size; mp->logical_size = size;
mp->data = folio_address(folio) + page_offset; mp->data = folio_address(folio) + page_offset;
mp->index = lblock; mp->index = lblock;
if (unlikely(insert_metapage(&folio->page, mp))) { if (unlikely(insert_metapage(folio, mp))) {
free_metapage(mp); free_metapage(mp);
goto unlock; goto unlock;
} }