btrfs: replace i_blocksize by fs_info::sectorsize
authorDavid Sterba <dsterba@suse.com>
Tue, 16 Jan 2024 17:17:14 +0000 (18:17 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 4 Mar 2024 15:24:46 +0000 (16:24 +0100)
The block size calculated by i_blocksize from inode is the same as what
we have in fs_info, initalized in inode_init_always(). Unify that to use
the fs_info value everywhere.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/file.c

index f8e1a7c..bd8d137 100644 (file)
@@ -3004,7 +3004,7 @@ reserve_space:
                }
                ret = btrfs_prealloc_file_range(inode, mode, alloc_start,
                                                alloc_end - alloc_start,
-                                               i_blocksize(inode),
+                                               fs_info->sectorsize,
                                                offset + len, &alloc_hint);
                unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend,
                              &cached_state);
@@ -3176,7 +3176,7 @@ static long btrfs_fallocate(struct file *file, int mode,
                if (!ret) {
                        ret = btrfs_prealloc_file_range(inode, mode,
                                        range->start,
-                                       range->len, i_blocksize(inode),
+                                       range->len, blocksize,
                                        offset + len, &alloc_hint);
                        /*
                         * btrfs_prealloc_file_range() releases space even