[PATCH v2 1/7] btrfs: save the original bi_iter into btrfs_bio for buffered read

Qu Wenruo
2022-05-25T10:59:43Z

Although we have btrfs_bio::iter, it currently have very limited usage:

- RAID56
Which is not needed at all

- btrfs_bio_clone()
This is used mostly for direct IO.

For the incoming read repair patches, we want to grab the original
logical bytenr, and be able to iterate the range of the bio (no matter
if it's cloned).

So this patch will also save btrfs_bio::iter for buffered read bios at
submit_one_bio().
And for the sake of consistency, also save the btrfs_bio::iter for
direct IO at btrfs_submit_dio_bio().

The reason that we didn't save the iter in btrfs_map_bio() is,
btrfs_map_bio() is going to handle various bios, with or without
btrfs_bio bioset.
And we want to keep btrfs_map_bio() to handle and only handle plain bios
without bother the bioset.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/btrfs/extent_io.c | 7 +++++++
fs/btrfs/inode.c | 2 ++
2 files changed, 9 insertions(+)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1d144f655f65..1bd1b1253f9d 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -188,6 +188,13 @@ static void submit_one_bio(struct bio *bio, int mirror_num,
/* Caller should ensure the bio has at least some range added */
ASSERT(bio->bi_iter.bi_size);

+ /*
+ * Save the original bi_iter for read bios, as read repair wants the
+ * orignial logical bytenr.
+ */
+ if (bio_op(bio) == REQ_OP_READ)
+ btrfs_bio(bio)->iter = bio->bi_iter;
+
if (is_data_inode(tree->private_data))
btrfs_submit_data_bio(tree->private_data, bio, mirror_num,
compress_type);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 34466b543ed9..dd0882e1b982 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7974,6 +7974,8 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio,
ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
if (ret)
goto err;
+ /* Check submit_one_bio() for the reason. */
+ btrfs_bio(bio)->iter = bio->bi_iter;
}

if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)
--
2.36.1