diff options
| author | Tony Battersby <tonyb@cybernetics.com> | 2014-08-22 15:53:39 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-08-22 15:04:31 -0500 |
| commit | 6f4a16266fb3e58cd3e200eab51d2220ef92d604 (patch) | |
| tree | efab6520c3793325ef2881f7fbe2e34df75f2204 /block/blk-mq.c | |
| parent | a57821cac6bb6e46abea118e34d0e86444ec1410 (diff) | |
| download | linux-6f4a16266fb3e58cd3e200eab51d2220ef92d604.tar.gz linux-6f4a16266fb3e58cd3e200eab51d2220ef92d604.tar.bz2 linux-6f4a16266fb3e58cd3e200eab51d2220ef92d604.zip | |
scsi-mq: fix requests that use a separate CDB buffer
This patch fixes code such as the following with scsi-mq enabled:
rq = blk_get_request(...);
blk_rq_set_block_pc(rq);
rq->cmd = my_cmd_buffer; /* separate CDB buffer */
blk_execute_rq_nowait(...);
Code like this appears in e.g. sg_start_req() in drivers/scsi/sg.c (for
large CDBs only). Without this patch, scsi_mq_prep_fn() will set
rq->cmd back to rq->__cmd, causing the wrong CDB to be sent to the device.
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 7950f8d7c1bb..4aac82615a46 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -176,6 +176,8 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, /* tag was already set */ rq->errors = 0; + rq->cmd = rq->__cmd; + rq->extra_len = 0; rq->sense_len = 0; rq->resid_len = 0; |