move more stuff down into bio_copy_user_iov() (2884d0be) · Commits · 戴 / test

block/bio.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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)

+0 −6

Original line number	Diff line number	Diff line
		@@ -66,12 +66,6 @@ static int __blk_rq_map_user_iov(struct request *rq,
		bio->bi_opf &= ~REQ_OP_MASK;
		bio->bi_opf \|= req_op(rq);

		if (map_data && map_data->null_mapped)
		bio_set_flag(bio, BIO_NULL_MAPPED);

		if (map_data)
		map_data->offset += bio->bi_iter.bi_size;

		orig_bio = bio;

		/*