Commit 590168ed authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop unused parameter file_offset from btrfs_encoded_read_regular_fill_pages() 



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

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e469da5d

fs/btrfs/btrfs_inode.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/send.c

+1 −1
Original line number Diff line number Diff line
@@ -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));