Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1547642

[PATCH v1 50/54] fs/buffer.c: use bvec iterator to truncate the bio

Show all headers | View raw

For making multipage bvec working well.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 fs/buffer.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 63d2f40c21fd..014892593f57 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3063,8 +3063,7 @@ void guard_bio_eod(int op, struct bio *bio)
 	unsigned truncated_bytes;
 	/*
 	 * It is safe to truncate the last bvec in the following way
-	 * even though multipage bvec is supported, but we need to
-	 * fix the parameters passed to zero_user().
+	 * even though multipage bvec is supported.
 	 */
 	struct bio_vec *bvec = &bio->bi_io_vec[bio->bi_vcnt - 1];
 
@@ -3087,15 +3086,21 @@ void guard_bio_eod(int op, struct bio *bio)
 	/* Uhhuh. We've got a bio that straddles the device size! */
 	truncated_bytes = bio->bi_iter.bi_size - (maxsector << 9);
 
-	/* Truncate the bio.. */
-	bio->bi_iter.bi_size -= truncated_bytes;
-	bvec->bv_len -= truncated_bytes;
-
 	/* ..and clear the end of the buffer for reads */
 	if (op == REQ_OP_READ) {
-		zero_user(bvec->bv_page, bvec->bv_offset + bvec->bv_len,
-				truncated_bytes);
+		struct bvec_iter start = BVEC_ITER_ALL_INIT;
+		struct bvec_iter iter;
+		struct bio_vec bv;
+
+		start.bi_bvec_done = bvec->bv_len - truncated_bytes;
+
+		__bvec_for_each_sp_bvec(bv, bvec, iter, start)
+			zero_user(bv.bv_page, bv.bv_offset, bv.bv_len);
 	}
+
+	/* Truncate the bio.. */
+	bio->bi_iter.bi_size -= truncated_bytes;
+	bvec->bv_len -= truncated_bytes;
 }
 
 static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v1 32/54] block: introduce bvec_get_last_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 53/54] btrfs: comment on direct access bvec table Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 46/54] fs: crypto: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 36/54] dm-crypt: don't clear bvec->bv_page in crypt_free_buffer_pages() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 50/54] fs/buffer.c: use bvec iterator to truncate the bio Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 54/54] block: enable multipage bvecs Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 47/54] fs/btrfs: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 33/54] block: deal with dirtying pages for multipage bvec Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 38/54] md/raid1.c: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 51/54] btrfs: avoid access to .bi_vcnt directly Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 52/54] btrfs: use bvec_get_last_sp to get the last singlepage bvec Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 39/54] fs/mpage: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 37/54] dm-crypt: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 35/54] bcache: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:10 +0100
  [PATCH v1 49/54] fs/iomap.c: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 44/54] f2fs: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 48/54] fs/block_dev.c: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 34/54] block: convert to singe/multi page version of bio_for_each_segment_all() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 41/54] ext4: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 43/54] gfs2: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 40/54] fs/direct-io: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
  [PATCH v1 45/54] exofs: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100
    Re: [PATCH v1 45/54] exofs: convert to bio_for_each_segment_all_sp() Boaz Harrosh <ooo@electrozaur.com> - 2017-01-03 16:10 +0100
  [PATCH v1 42/54] xfs: convert to bio_for_each_segment_all_sp() Ming Lei <tom.leiming@gmail.com> - 2016-12-27 17:20 +0100

csiph-web