btrfs: open code set_page_extent_mapped()

The function set_page_extent_mapped() is now a simple wrapper so use the
folio helper.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bc4d41985c4b5a29a9866944ff233cf2702de55c..532a5f09121fa10ea33f4eea14f01c22e843f097 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -862,11 +862,6 @@ static int attach_extent_buffer_folio(struct extent_buffer *eb,
        return ret;
 }
 
-int set_page_extent_mapped(struct page *page)
-{
-       return set_folio_extent_mapped(page_folio(page));
-}
-
 int set_folio_extent_mapped(struct folio *folio)
 {
        struct btrfs_fs_info *fs_info;

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 8a36117ed4532bb502db2dc8919b401b96cd7c95..d14bda928e7b6c5be5e4604d3b3595293c666a88 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -248,7 +248,6 @@ int btree_write_cache_pages(struct address_space *mapping,
                            struct writeback_control *wbc);
 void btrfs_readahead(struct readahead_control *rac);
 int set_folio_extent_mapped(struct folio *folio);
-int set_page_extent_mapped(struct page *page);
 void clear_folio_extent_mapped(struct folio *folio);
 
 struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 3048cb38dc80baa0d27cfc633491fc91ca962f2b..d42b6f882f57419c7ecaddd51ed096f2cb1599f4 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -461,7 +461,7 @@ static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, bool uptodate)
                        return -ENOMEM;
                }
 
-               ret = set_page_extent_mapped(page);
+               ret = set_folio_extent_mapped(page_folio(page));
                if (ret < 0) {
                        unlock_page(page);
                        put_page(page);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index d4100e58172f30d3fc0d3727e039f4e90303a89d..af0969b70b532025e73a8bcdeb84f2e43bd33eb1 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2870,7 +2870,7 @@ again:
 
        /*
         * We could have lost folio private when we dropped the lock to read the
-        * folio above, make sure we set_page_extent_mapped here so we have any
+        * folio above, make sure we set_folio_extent_mapped() here so we have any
         * of the subpage blocksize stuff we need in place.
         */
        ret = set_folio_extent_mapped(folio);