diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-01-31 18:57:31 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-01 00:00:44 +0300 |
| commit | aebf526b53aea164508730427597d45f3e06b376 (patch) | |
| tree | 98ab726d0f7feb610feee9830246c900c6919eea /drivers/ide/ide-eh.c | |
| parent | 2f5a8e80f79dc82e00f4cca557dc9ceaf064b450 (diff) | |
| download | linux-aebf526b53aea164508730427597d45f3e06b376.tar.xz | |
block: fold cmd_type into the REQ_OP_ space
Instead of keeping two levels of indirection for requests types, fold it
all into the operations. The little caveat here is that previously
cmd_type only applied to struct request, while the request and bio op
fields were set to plain REQ_OP_READ/WRITE even for passthrough
operations.
Instead this patch adds new REQ_OP_* for SCSI passthrough and driver
private requests, althought it has to add two for each so that we
can communicate the data in/out nature of the request.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/ide/ide-eh.c')
| -rw-r--r-- | drivers/ide/ide-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c index 1e4b1476e559..cf3af6840368 100644 --- a/drivers/ide/ide-eh.c +++ b/drivers/ide/ide-eh.c @@ -123,7 +123,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat) return ide_stopped; /* retry only "normal" I/O: */ - if (rq->cmd_type != REQ_TYPE_FS) { + if (blk_rq_is_passthrough(rq)) { if (ata_taskfile_request(rq)) { struct ide_cmd *cmd = rq->special; |