diff options
| author | Keith Busch <keith.busch@intel.com> | 2014-10-17 17:46:35 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-28 09:44:11 -0700 |
| commit | febf71588c2a750e04dc2a8b0824ce120c48bd9e (patch) | |
| tree | 2f1c48dda46cd66ec3d72b025753cd5c856e6a7c | |
| parent | 24391c0dc57c3756a219defaa781e68637d6ab7d (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>
| -rw-r--r-- | block/blk-core.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 3ad405571dc..1b5fa214efa 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, if (!bs) bs = fs_bio_set; - blk_rq_init(NULL, rq); - __rq_for_each_bio(bio_src, rq_src) { bio = bio_clone_fast(bio_src, gfp_mask, bs); if (!bio) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index b98cd9d8443..f251633a51a 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1719,6 +1719,7 @@ static int setup_clone(struct request *clone, struct request *rq, { int r; + blk_rq_init(NULL, rq); r = blk_rq_prep_clone(clone, rq, tio->md->bs, GFP_ATOMIC, dm_rq_bio_constructor, tio); if (r) |