From 2884d0be878eb5cbbc6d983c6054feef3b9aa86d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 24 Sep 2017 12:09:21 -0400 Subject: move more stuff down into bio_copy_user_iov() Signed-off-by: Al Viro --- block/bio.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'block/bio.c') diff --git a/block/bio.c b/block/bio.c index cd1282db03cb..02457c2d4379 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1289,6 +1289,9 @@ struct bio *bio_copy_user_iov(struct request_queue *q, if (ret) goto cleanup; + if (map_data) + map_data->offset += bio->bi_iter.bi_size; + /* * success */ @@ -1301,6 +1304,8 @@ struct bio *bio_copy_user_iov(struct request_queue *q, iov_iter_advance(iter, bio->bi_iter.bi_size); bio->bi_private = bmd; + if (map_data && map_data->null_mapped) + bio_set_flag(bio, BIO_NULL_MAPPED); return bio; cleanup: if (!map_data) -- cgit v1.2.1