Re: [PATCH V10 08/19] btrfs: move bio_pages_all() to btrfs

From
Omar Sandoval <osandov@osandov.com>
Date
2018-11-16 00:23:56
Also in
dm-devel, linux-bcache, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-mm, linux-xfs, lkml
Reply to
Ming Lei, 2018-11-15
On Thu, Nov 15, 2018 at 04:52:55PM +0800, Ming Lei wrote:
BTRFS is the only user of this helper, so move this helper into
BTRFS, and implement it via bio_for_each_segment_all(), since
bio->bi_vcnt may not equal to number of pages after multipage bvec
is enabled.
Shouldn't you also get rid of bio_pages_all() in this patch?
quoted hunk ↗ jump to hunk
Cc: Dave Chinner <redacted>
Cc: Kent Overstreet <redacted>
Cc: Mike Snitzer <redacted>
Cc: <redacted>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <redacted>
Cc: Shaohua Li <shli@kernel.org>
Cc: <redacted>
Cc: <redacted>
Cc: David Sterba <dsterba@suse.com>
Cc: <redacted>
Cc: Darrick J. Wong <redacted>
Cc: <redacted>
Cc: Gao Xiang <redacted>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: <redacted>
Cc: Coly Li <redacted>
Cc: <redacted>
Cc: Boaz Harrosh <redacted>
Cc: Bob Peterson <redacted>
Cc: <redacted>
Signed-off-by: Ming Lei <redacted>
---
 fs/btrfs/extent_io.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5d5965297e7e..874bb9aeebdc 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2348,6 +2348,18 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
 	return bio;
 }
 
+static unsigned btrfs_bio_pages_all(struct bio *bio)
+{
+	unsigned i;
+	struct bio_vec *bv;
+
+	WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));
+
+	bio_for_each_segment_all(bv, bio, i)
+		;
+	return i;
+}
+
 /*
  * this is a generic handler for readpage errors (default
  * readpage_io_failed_hook). if other copies exist, read those and write back
@@ -2368,7 +2380,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
 	int read_mode = 0;
 	blk_status_t status;
 	int ret;
-	unsigned failed_bio_pages = bio_pages_all(failed_bio);
+	unsigned failed_bio_pages = btrfs_bio_pages_all(failed_bio);
 
 	BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE);
 
-- 
2.9.5
Thread (102 messages) 102 messages, 8 authors, last reply 2018-11-21
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help