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-core.c | |
| parent | block: support > 16 byte CDBs for SG_IO (diff) | |
| download | linux-dev-6f4a16266fb3e58cd3e200eab51d2220ef92d604.tar.xz linux-dev-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-core.c')
| -rw-r--r-- | block/blk-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c359d72e9d76..bf930f481d43 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1252,7 +1252,6 @@ void blk_rq_set_block_pc(struct request *rq) rq->__sector = (sector_t) -1; rq->bio = rq->biotail = NULL; memset(rq->__cmd, 0, sizeof(rq->__cmd)); - rq->cmd = rq->__cmd; } EXPORT_SYMBOL(blk_rq_set_block_pc); |