btrfs: rename __get_extent_map() and pass btrfs_inode

[ Upstream commit 06de96faf795b5c276a3be612da6b08c6112e747 ]

The double underscore naming scheme does not apply here, there's only
only get_extent_map(). As the definition is changed also pass the struct
btrfs_inode.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: acc18e1c1d8c ("btrfs: fix stale page cache after race between readahead and direct IO write")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 42c9899d9241c97f622cd329cfb14a0c3e5d3fea..e6e6c4dc53c48b409c29eab6c542255b3e253c18 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -901,9 +901,9 @@ void clear_folio_extent_mapped(struct folio *folio)
        folio_detach_private(folio);
 }
 
-static struct extent_map *__get_extent_map(struct inode *inode,
-                                          struct folio *folio, u64 start,
-                                          u64 len, struct extent_map **em_cached)
+static struct extent_map *get_extent_map(struct btrfs_inode *inode,
+                                        struct folio *folio, u64 start,
+                                        u64 len, struct extent_map **em_cached)
 {
        struct extent_map *em;
        struct extent_state *cached_state = NULL;
@@ -922,14 +922,14 @@ static struct extent_map *__get_extent_map(struct inode *inode,
                *em_cached = NULL;
        }
 
-       btrfs_lock_and_flush_ordered_range(BTRFS_I(inode), start, start + len - 1, &cached_state);
-       em = btrfs_get_extent(BTRFS_I(inode), folio, start, len);
+       btrfs_lock_and_flush_ordered_range(inode, start, start + len - 1, &cached_state);
+       em = btrfs_get_extent(inode, folio, start, len);
        if (!IS_ERR(em)) {
                BUG_ON(*em_cached);
                refcount_inc(&em->refs);
                *em_cached = em;
        }
-       unlock_extent(&BTRFS_I(inode)->io_tree, start, start + len - 1, &cached_state);
+       unlock_extent(&inode->io_tree, start, start + len - 1, &cached_state);
 
        return em;
 }
@@ -985,8 +985,7 @@ static int btrfs_do_readpage(struct folio *folio, struct extent_map **em_cached,
                        end_folio_read(folio, true, cur, iosize);
                        break;
                }
-               em = __get_extent_map(inode, folio, cur, end - cur + 1,
-                                     em_cached);
+               em = get_extent_map(BTRFS_I(inode), folio, cur, end - cur + 1, em_cached);
                if (IS_ERR(em)) {
                        end_folio_read(folio, false, cur, end + 1 - cur);
                        return PTR_ERR(em);