btrfs: use pgoff_t for page index variables

Any conversion of offsets in the logical or the physical mapping space
of the pages is done by a shift and the target type should be pgoff_t
(type of struct page::index). Fix the locations where it's still
unsigned long.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 6d3161bc778142ede87d3cf117c7caeb0ab35f51..d09d622016ef54ffcff4613a8edd62492c0cd2c6 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -282,8 +282,8 @@ static noinline void end_compressed_writeback(const struct compressed_bio *cb)
 {
        struct inode *inode = &cb->bbio.inode->vfs_inode;
        struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
-       unsigned long index = cb->start >> PAGE_SHIFT;
-       unsigned long end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT;
+       pgoff_t index = cb->start >> PAGE_SHIFT;
+       const pgoff_t end_index = (cb->start + cb->len - 1) >> PAGE_SHIFT;
        struct folio_batch fbatch;
        int i;
        int ret;
@@ -415,7 +415,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                                     int *memstall, unsigned long *pflags)
 {
        struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
-       unsigned long end_index;
+       pgoff_t end_index;
        struct bio *orig_bio = &cb->orig_bbio->bio;
        u64 cur = cb->orig_bbio->file_offset + orig_bio->bi_iter.bi_size;
        u64 isize = i_size_read(inode);
@@ -446,8 +446,8 @@ static noinline int add_ra_bio_pages(struct inode *inode,
        end_index = (i_size_read(inode) - 1) >> PAGE_SHIFT;
 
        while (cur < compressed_end) {
-               u64 page_end;
-               u64 pg_index = cur >> PAGE_SHIFT;
+               pgoff_t page_end;
+               pgoff_t pg_index = cur >> PAGE_SHIFT;
                u32 add_size;
 
                if (pg_index > end_index)
@@ -1482,7 +1482,7 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,
                                     struct heuristic_ws *ws)
 {
        struct page *page;
-       u64 index, index_end;
+       pgoff_t index, index_end;
        u32 i, curr_sample_pos;
        u8 *in_data;
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 7c171e236fe9cb464a742801e9edbf665036f15c..d277a13d7bb525781f8a92017b0cd251e63a6992 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1662,7 +1662,7 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
        int ret;
        size_t pg_offset;
        loff_t i_size = i_size_read(&inode->vfs_inode);
-       unsigned long end_index = i_size >> PAGE_SHIFT;
+       const pgoff_t end_index = i_size >> PAGE_SHIFT;
        const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);
 
        trace_extent_writepage(folio, &inode->vfs_inode, bio_ctrl->wbc);
@@ -3146,7 +3146,7 @@ static int attach_eb_folio_to_filemap(struct extent_buffer *eb, int i,
 
        struct btrfs_fs_info *fs_info = eb->fs_info;
        struct address_space *mapping = fs_info->btree_inode->i_mapping;
-       const unsigned long index = eb->start >> PAGE_SHIFT;
+       const pgoff_t index = eb->start >> PAGE_SHIFT;
        struct folio *existing_folio;
        int ret;
 

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 247676f34f2e66d770fc2f1d1ef3e236d3190914..05b046c6806fe595865e6b2a23ee28222f2bf227 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -856,7 +856,7 @@ static noinline int prepare_one_folio(struct inode *inode, struct folio **folio_
                                      loff_t pos, size_t write_bytes,
                                      bool nowait)
 {
-       unsigned long index = pos >> PAGE_SHIFT;
+       const pgoff_t index = pos >> PAGE_SHIFT;
        gfp_t mask = get_prepare_gfp_flags(inode, nowait);
        fgf_t fgp_flags = (nowait ? FGP_WRITEBEGIN | FGP_NOWAIT : FGP_WRITEBEGIN) |
                          fgf_set_order(write_bytes);

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index efd21a28570c1e87dde6e606a65cee0fa1149d82..5d8d1570a5c94836e2e8433759743b5a1ef9eaf4 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -366,7 +366,7 @@ fail:
 static void readahead_cache(struct inode *inode)
 {
        struct file_ra_state ra;
-       unsigned long last_index;
+       pgoff_t last_index;
 
        file_ra_state_init(&ra, inode->i_mapping);
        last_index = (i_size_read(inode) - 1) >> PAGE_SHIFT;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6df7ef1b869b2e06106eca9ba92cc4b1cd5041c1..403b94553f8e0a93ec9fccbb33a809aef11b5338 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -395,8 +395,8 @@ void btrfs_inode_unlock(struct btrfs_inode *inode, unsigned int ilock_flags)
 static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode,
                                                 u64 offset, u64 bytes)
 {
-       unsigned long index = offset >> PAGE_SHIFT;
-       unsigned long end_index = (offset + bytes - 1) >> PAGE_SHIFT;
+       pgoff_t index = offset >> PAGE_SHIFT;
+       const pgoff_t end_index = (offset + bytes - 1) >> PAGE_SHIFT;
        struct folio *folio;
 
        while (index <= end_index) {
@@ -808,12 +808,11 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,
 
 static int extent_range_clear_dirty_for_io(struct btrfs_inode *inode, u64 start, u64 end)
 {
-       unsigned long end_index = end >> PAGE_SHIFT;
+       const pgoff_t end_index = end >> PAGE_SHIFT;
        struct folio *folio;
        int ret = 0;
 
-       for (unsigned long index = start >> PAGE_SHIFT;
-            index <= end_index; index++) {
+       for (pgoff_t index = start >> PAGE_SHIFT; index <= end_index; index++) {
                folio = filemap_get_folio(inode->vfs_inode.i_mapping, index);
                if (IS_ERR(folio)) {
                        if (!ret)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index c28db44cb5c4fc3a989e944670be93e93316f48a..3621ed2eacd170b24089d616a360c5e6f4248ab8 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4658,7 +4658,7 @@ static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int iss
        struct btrfs_uring_priv *priv = bc->priv;
        struct btrfs_inode *inode = BTRFS_I(file_inode(priv->iocb.ki_filp));
        struct extent_io_tree *io_tree = &inode->io_tree;
-       unsigned long index;
+       pgoff_t index;
        u64 cur;
        size_t page_offset;
        ssize_t ret;

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 2670c0eb3cdaf3b7cd369ac0794ffb143cb1db04..82080fecffa2c11f1c58e911e24c8df3ac244566 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2814,13 +2814,13 @@ static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster,
 
 static int relocate_one_folio(struct reloc_control *rc,
                              struct file_ra_state *ra,
-                             int *cluster_nr, unsigned long index)
+                             int *cluster_nr, pgoff_t index)
 {
        const struct file_extent_cluster *cluster = &rc->cluster;
        struct inode *inode = rc->data_inode;
        struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
        u64 offset = BTRFS_I(inode)->reloc_block_group_start;
-       const unsigned long last_index = (cluster->end - offset) >> PAGE_SHIFT;
+       const pgoff_t last_index = (cluster->end - offset) >> PAGE_SHIFT;
        gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);
        struct folio *folio;
        u64 folio_start;
@@ -2974,8 +2974,8 @@ static int relocate_file_extent_cluster(struct reloc_control *rc)
        struct inode *inode = rc->data_inode;
        const struct file_extent_cluster *cluster = &rc->cluster;
        u64 offset = BTRFS_I(inode)->reloc_block_group_start;
-       unsigned long index;
-       unsigned long last_index;
+       pgoff_t index;
+       pgoff_t last_index;
        struct file_ra_state *ra;
        int cluster_nr = 0;
        int ret = 0;

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 87f7437be022b8ef29b98f0a03afa6b3e3b5a075..660141fc67a87f7d8d8e6e33777bee2222f64444 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -23,8 +23,8 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,
 {
        int ret;
        struct folio_batch fbatch;
-       unsigned long index = start >> PAGE_SHIFT;
-       unsigned long end_index = end >> PAGE_SHIFT;
+       pgoff_t index = start >> PAGE_SHIFT;
+       pgoff_t end_index = end >> PAGE_SHIFT;
        int i;
        int count = 0;
        int loops = 0;
@@ -114,7 +114,6 @@ static int test_find_delalloc(u32 sectorsize, u32 nodesize)
        struct extent_io_tree *tmp;
        struct page *page;
        struct page *locked_page = NULL;
-       unsigned long index = 0;
        /* In this test we need at least 2 file extents at its maximum size */
        u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
        u64 total_dirty = 2 * max_bytes;
@@ -157,7 +156,7 @@ static int test_find_delalloc(u32 sectorsize, u32 nodesize)
         * everything to make sure our pages don't get evicted and screw up our
         * test.
         */
-       for (index = 0; index < (total_dirty >> PAGE_SHIFT); index++) {
+       for (pgoff_t index = 0; index < (total_dirty >> PAGE_SHIFT); index++) {
                page = find_or_create_page(inode->i_mapping, index, GFP_KERNEL);
                if (!page) {
                        test_err("failed to allocate test page");