]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: use filemap_get_folio() helper
authorAnand Jain <anand.jain@oracle.com>
Mon, 14 Oct 2024 15:11:38 +0000 (23:11 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 11 Nov 2024 13:34:19 +0000 (14:34 +0100)
When fgp_flags and gfp_flags are zero, use filemap_get_folio(A, B)
instead of __filemap_get_folio(A, B, 0, 0)—no need for the extra
arguments 0, 0.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/compression.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c

index 21d73ea594a9993ca1fcf68dec60ec7d436ef602..0c4d486c3048da65f7d39dc535332a8f70e68aef 100644 (file)
@@ -453,7 +453,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                if (pg_index > end_index)
                        break;
 
-               folio = __filemap_get_folio(mapping, pg_index, 0, 0);
+               folio = filemap_get_folio(mapping, pg_index);
                if (!IS_ERR(folio)) {
                        u64 folio_sz = folio_size(folio);
                        u64 offset = offset_in_folio(folio, cur);
index 1beaba23253242b73ae1598178dc4ac9a254d8bf..e629d2ee152a61df2a1394b0a1888177c33dcce3 100644 (file)
@@ -2265,7 +2265,7 @@ void extent_write_locked_range(struct inode *inode, const struct folio *locked_f
                u32 cur_len = cur_end + 1 - cur;
                struct folio *folio;
 
-               folio = __filemap_get_folio(mapping, cur >> PAGE_SHIFT, 0, 0);
+               folio = filemap_get_folio(mapping, cur >> PAGE_SHIFT);
 
                /*
                 * This shouldn't happen, the pages are pinned and locked, this
index 42e87a0f094653cbcbf25e74d264fd3875d18668..87a30d9cb6e57996ff38b5f18cc3d1f718a48dc5 100644 (file)
@@ -421,7 +421,7 @@ static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode,
                        index++;
                        continue;
                }
-               folio = __filemap_get_folio(inode->vfs_inode.i_mapping, index, 0, 0);
+               folio = filemap_get_folio(inode->vfs_inode.i_mapping, index);
                index++;
                if (IS_ERR(folio))
                        continue;
@@ -556,8 +556,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
        } else {
                struct folio *folio;
 
-               folio = __filemap_get_folio(inode->vfs_inode.i_mapping,
-                                           0, 0, 0);
+               folio = filemap_get_folio(inode->vfs_inode.i_mapping, 0);
                ASSERT(!IS_ERR(folio));
                btrfs_set_file_extent_compression(leaf, ei, 0);
                kaddr = kmap_local_folio(folio, 0);
@@ -880,7 +879,7 @@ static int extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 e
 
        for (unsigned long index = start >> PAGE_SHIFT;
             index <= end_index; index++) {
-               folio = __filemap_get_folio(inode->i_mapping, index, 0, 0);
+               folio = filemap_get_folio(inode->i_mapping, index);
                if (IS_ERR(folio)) {
                        if (!ret)
                                ret = PTR_ERR(folio);