btrfs: drop unused parameter file_offset from btrfs_encoded_read_regular_fill_pages()

[ Upstream commit 590168edbe6317ca9f4066215fb099f43ffe745c ]

The file_offset parameter used to be passed to encoded read struct but
was removed in commit b665affe93d8 ("btrfs: remove unused members from
struct btrfs_encoded_read_private").

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: 05b36b04d74a ("btrfs: fix use-after-free in btrfs_encoded_read_endio()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index e152fde888fc9acd2a27e475fcfb20b862c4673a..5e2d93c2dfb5ac5c569da5a9752c77305c0e3391 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -613,8 +613,7 @@ int btrfs_writepage_cow_fixup(struct folio *folio);
 int btrfs_encoded_io_compression_from_extent(struct btrfs_fs_info *fs_info,
                                             int compress_type);
 int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
-                                         u64 file_offset, u64 disk_bytenr,
-                                         u64 disk_io_size,
+                                         u64 disk_bytenr, u64 disk_io_size,
                                          struct page **pages);
 ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter,
                           struct btrfs_ioctl_encoded_io_args *encoded);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1e4ca1e7d2e58d4d209bfe41f4f000749f5e37ec..753e9cb0c371776190a864f66fd0334afad5b15a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9132,8 +9132,8 @@ static void btrfs_encoded_read_endio(struct btrfs_bio *bbio)
 }
 
 int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
-                                         u64 file_offset, u64 disk_bytenr,
-                                         u64 disk_io_size, struct page **pages)
+                                         u64 disk_bytenr, u64 disk_io_size,
+                                         struct page **pages)
 {
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
        struct btrfs_encoded_read_private priv = {
@@ -9203,7 +9203,7 @@ static ssize_t btrfs_encoded_read_regular(struct kiocb *iocb,
                goto out;
                }
 
-       ret = btrfs_encoded_read_regular_fill_pages(inode, start, disk_bytenr,
+       ret = btrfs_encoded_read_regular_fill_pages(inode, disk_bytenr,
                                                    disk_io_size, pages);
        if (ret)
                goto out;

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index b068469871f8e554aca9688048344f3c9d4e0ac7..0cb11dcd10cd4be48fe236a6477660700eda5abd 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -5677,7 +5677,7 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path,
         * Note that send_buf is a mapping of send_buf_pages, so this is really
         * reading into send_buf.
         */
-       ret = btrfs_encoded_read_regular_fill_pages(BTRFS_I(inode), offset,
+       ret = btrfs_encoded_read_regular_fill_pages(BTRFS_I(inode),
                                                    disk_bytenr, disk_num_bytes,
                                                    sctx->send_buf_pages +
                                                    (data_offset >> PAGE_SHIFT));