diff options
author | Qu Wenruo <wqu@suse.com> | 2023-12-07 09:39:28 +1030 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2023-12-15 23:01:04 +0100 |
commit | 13df3775efcaf412980c45aba2c321479bfc209a (patch) | |
tree | b52d01d42e7d8328c2f22cde7cd70200809016bd /fs/btrfs/inode.c | |
parent | 082d5bb9b336d533b7b968f4f8712e7755a9876a (diff) | |
download | linux-stable-13df3775efcaf412980c45aba2c321479bfc209a.tar.gz linux-stable-13df3775efcaf412980c45aba2c321479bfc209a.tar.bz2 linux-stable-13df3775efcaf412980c45aba2c321479bfc209a.zip |
btrfs: cleanup metadata page pointer usage
Although we have migrated extent_buffer::pages[] to folios[], we're
still mostly using the folio_page() help to grab the page.
This patch would do the following cleanups for metadata:
- Introduce num_extent_folios() helper
This is to replace most num_extent_pages() callers.
- Use num_extent_folios() to iterate future large folios
This allows us to use things like
bio_add_folio()/bio_add_folio_nofail(), and only set the needed flags
for the folio (aka the leading/tailing page), which reduces the loop
iteration to 1 for large folios.
- Change metadata related functions to use folio pointers
Including their function name, involving:
* attach_extent_buffer_page()
* detach_extent_buffer_page()
* page_range_has_eb()
* btrfs_release_extent_buffer_pages()
* btree_clear_page_dirty()
* btrfs_page_inc_eb_refs()
* btrfs_page_dec_eb_refs()
- Change btrfs_is_subpage() to accept an address_space pointer
This is to allow both page->mapping and folio->mapping to be utilized.
As data is still using the old per-page code, and may keep so for a
while.
- Special corner case place holder for future order mismatches between
extent buffer and inode filemap
For now it's just a block of comments and a dead ASSERT(), no real
handling yet.
The subpage code would still go page, just because subpage and large
folio are conflicting conditions, thus we don't need to bother subpage
with higher order folios at all. Just folio_page(folio, 0) would be
enough.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ minor styling tweaks ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4e8c82e5d7a6..ac01f49161ff 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7867,7 +7867,7 @@ static void wait_subpage_spinlock(struct page *page) struct folio *folio = page_folio(page); struct btrfs_subpage *subpage; - if (!btrfs_is_subpage(fs_info, page)) + if (!btrfs_is_subpage(fs_info, page->mapping)) return; ASSERT(folio_test_private(folio) && folio_get_private(folio)); |