diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-23 15:15:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-23 15:15:16 -0700 |
| commit | 371c141464b8312ee4a298fad6d17ee26654b7d6 (patch) | |
| tree | 0a9baf8c4d1008d8dbc9df8aa6c2667bcb7f7ad1 /include/linux | |
| parent | ca83c61cb3db964061ea186654bf8e1879589de3 (diff) | |
| parent | d0fa70aca54c8643248e89061da23752506ec0d4 (diff) | |
Merge tag 'jfs-6.11' of github.com:kleikamp/linux-shaggy
Pull jfs updates from David Kleikamp:
"Folio conversion from Matthew Wilcox and a few various fixes"
* tag 'jfs-6.11' of github.com:kleikamp/linux-shaggy:
jfs: don't walk off the end of ealist
jfs: Fix shift-out-of-bounds in dbDiscardAG
jfs: Fix array-index-out-of-bounds in diFree
jfs: fix null ptr deref in dtInsertEntry
jfs: Remove use of folio error flag
fs: Remove i_blocks_per_page
jfs: Change metapage->page to metapage->folio
jfs: Convert force_metapage to use a folio
jfs: Convert inc_io to take a folio
jfs: Convert page_to_mp to folio_to_mp
jfs; Convert __invalidate_metapages to use a folio
jfs: Convert dec_io to take a folio
jfs: Convert drop_metapage and remove_metapage to take a folio
jfs; Convert release_metapage to use a folio
jfs: Convert insert_metapage() to take a folio
jfs: Convert __get_metapage to use a folio
jfs: Convert metapage_writepage to metapage_write_folio
jfs: Convert metapage_read_folio to use folio APIs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pagemap.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 483a191bb4df..d9c7edb6422b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1537,10 +1537,4 @@ unsigned int i_blocks_per_folio(struct inode *inode, struct folio *folio) { return folio_size(folio) >> inode->i_blkbits; } - -static inline -unsigned int i_blocks_per_page(struct inode *inode, struct page *page) -{ - return i_blocks_per_folio(inode, page_folio(page)); -} #endif /* _LINUX_PAGEMAP_H */ |