]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: drop unused parameter file_offset from btrfs_encoded_read_regular_fill_pages()
authorDavid Sterba <dsterba@suse.com>
Wed, 9 Oct 2024 14:31:47 +0000 (16:31 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 11 Nov 2024 13:34:16 +0000 (14:34 +0100)
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>
fs/btrfs/btrfs_inode.h
fs/btrfs/inode.c
fs/btrfs/send.c

index c514bab532fafd83089b7c1c4151a520b52dff0c..157fd3f4cb333abd2464136da49a79d7d91439c3 100644 (file)
@@ -612,8 +612,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);
index 842baa63e3a4a8ddaecd2c8934832ec28490fe55..6abcfdfe7b3018d3da78a9d431f2d4359a2ce2ba 100644 (file)
@@ -9078,8 +9078,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 = {
@@ -9149,7 +9149,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;
index 3c35936d91b53af7c0cf7b3b38ad2fb9706776b7..efbe1c08a5adaee6e2e13bb1f67f0c03883f4462 100644 (file)
@@ -5667,7 +5667,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));