Commit a6d3d495 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

iomap: switch __iomap_dio_rw to use iomap_iter

Switch __iomap_dio_rw to use iomap_iter.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 253564ba
...@@ -8194,9 +8194,10 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, ...@@ -8194,9 +8194,10 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio,
return dip; return dip;
} }
static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, static blk_qc_t btrfs_submit_direct(const struct iomap_iter *iter,
struct bio *dio_bio, loff_t file_offset) struct bio *dio_bio, loff_t file_offset)
{ {
struct inode *inode = iter->inode;
const bool write = (btrfs_op(dio_bio) == BTRFS_MAP_WRITE); const bool write = (btrfs_op(dio_bio) == BTRFS_MAP_WRITE);
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
const bool raid56 = (btrfs_data_alloc_profile(fs_info) & const bool raid56 = (btrfs_data_alloc_profile(fs_info) &
...@@ -8212,7 +8213,7 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, ...@@ -8212,7 +8213,7 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap,
int ret; int ret;
blk_status_t status; blk_status_t status;
struct btrfs_io_geometry geom; struct btrfs_io_geometry geom;
struct btrfs_dio_data *dio_data = iomap->private; struct btrfs_dio_data *dio_data = iter->iomap.private;
struct extent_map *em = NULL; struct extent_map *em = NULL;
dip = btrfs_create_dio_private(dio_bio, inode, file_offset); dip = btrfs_create_dio_private(dio_bio, inode, file_offset);
......
This diff is collapsed.
...@@ -322,8 +322,8 @@ int iomap_writepages(struct address_space *mapping, ...@@ -322,8 +322,8 @@ int iomap_writepages(struct address_space *mapping,
struct iomap_dio_ops { struct iomap_dio_ops {
int (*end_io)(struct kiocb *iocb, ssize_t size, int error, int (*end_io)(struct kiocb *iocb, ssize_t size, int error,
unsigned flags); unsigned flags);
blk_qc_t (*submit_io)(struct inode *inode, struct iomap *iomap, blk_qc_t (*submit_io)(const struct iomap_iter *iter, struct bio *bio,
struct bio *bio, loff_t file_offset); loff_t file_offset);
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment