diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-01-27 09:46:29 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:35 -0700 |
| commit | 82ed4db499b8598f16f8871261bff088d6b0597f (patch) | |
| tree | e1cc0a433bf5ae2b9723837291617bdfeeb61816 /drivers/ide/ide-io.c | |
| parent | 8ae94eb65be9425af4d57a4f4cfebfdf03081e93 (diff) | |
| download | op-kernel-dev-82ed4db499b8598f16f8871261bff088d6b0597f.zip op-kernel-dev-82ed4db499b8598f16f8871261bff088d6b0597f.tar.gz | |
block: split scsi_request out of struct request
And require all drivers that want to support BLOCK_PC to allocate it
as the first thing of their private data. To support this the legacy
IDE and BSG code is switched to set cmd_size on their queues to let
the block layer allocate the additional space.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 201e43f..3378503 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq) { - u8 cmd = rq->cmd[0]; + u8 cmd = scsi_req(rq)->cmd[0]; switch (cmd) { case REQ_PARK_HEADS: @@ -545,6 +545,7 @@ repeat: goto plug_device; } + scsi_req(rq)->resid_len = blk_rq_bytes(rq); hwif->rq = rq; spin_unlock_irq(&hwif->lock); |
