Message ID | 20200914093711.13523-2-nborisov@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Cleanup metadata page reading path | expand |
On 2020/9/14 下午5:37, Nikolay Borisov wrote: > There is no way for this function to be called as ->readpage() since > it's called from > generic_file_buffered_read/filemap_fault/do_read_cache_page/readhead > code. BTRFS doesn't utilize the first 3 for the btree inode and > implements it's owon readhead mechanism. So simply remove the function. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> With the new commit message, it's way easier to know why that function is not needed. Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/disk-io.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 7147237d9bf0..d63498f3c75f 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -949,11 +949,6 @@ static int btree_writepages(struct address_space *mapping, > return btree_write_cache_pages(mapping, wbc); > } > > -static int btree_readpage(struct file *file, struct page *page) > -{ > - return extent_read_full_page(page, btree_get_extent, 0); > -} > - > static int btree_releasepage(struct page *page, gfp_t gfp_flags) > { > if (PageWriteback(page) || PageDirty(page)) > @@ -993,7 +988,6 @@ static int btree_set_page_dirty(struct page *page) > } > > static const struct address_space_operations btree_aops = { > - .readpage = btree_readpage, > .writepages = btree_writepages, > .releasepage = btree_releasepage, > .invalidatepage = btree_invalidatepage, >
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7147237d9bf0..d63498f3c75f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -949,11 +949,6 @@ static int btree_writepages(struct address_space *mapping, return btree_write_cache_pages(mapping, wbc); } -static int btree_readpage(struct file *file, struct page *page) -{ - return extent_read_full_page(page, btree_get_extent, 0); -} - static int btree_releasepage(struct page *page, gfp_t gfp_flags) { if (PageWriteback(page) || PageDirty(page)) @@ -993,7 +988,6 @@ static int btree_set_page_dirty(struct page *page) } static const struct address_space_operations btree_aops = { - .readpage = btree_readpage, .writepages = btree_writepages, .releasepage = btree_releasepage, .invalidatepage = btree_invalidatepage,
There is no way for this function to be called as ->readpage() since it's called from generic_file_buffered_read/filemap_fault/do_read_cache_page/readhead code. BTRFS doesn't utilize the first 3 for the btree inode and implements it's owon readhead mechanism. So simply remove the function. Signed-off-by: Nikolay Borisov <nborisov@suse.com> --- fs/btrfs/disk-io.c | 6 ------ 1 file changed, 6 deletions(-)