aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2014-10-17 19:46:35 -0400
committerJens Axboe <axboe@fb.com>2015-01-28 11:44:11 -0500
commitfebf71588c2a750e04dc2a8b0824ce120c48bd9e (patch)
tree2f1c48dda46cd66ec3d72b025753cd5c856e6a7c /block
parent24391c0dc57c3756a219defaa781e68637d6ab7d (diff)
block: require blk_rq_prep_clone() be given an initialized clone request
Prepare to allow blk_rq_prep_clone() to accept clone requests that were allocated from blk-mq request queues. As such the blk_rq_prep_clone() caller must first initialize the clone request. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 3ad405571dcc..1b5fa214efa3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2945,8 +2945,6 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
2945 if (!bs) 2945 if (!bs)
2946 bs = fs_bio_set; 2946 bs = fs_bio_set;
2947 2947
2948 blk_rq_init(NULL, rq);
2949
2950 __rq_for_each_bio(bio_src, rq_src) { 2948 __rq_for_each_bio(bio_src, rq_src) {
2951 bio = bio_clone_fast(bio_src, gfp_mask, bs); 2949 bio = bio_clone_fast(bio_src, gfp_mask, bs);
2952 if (!bio) 2950 if (!bio)