diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-17 14:08:19 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-17 14:08:19 -0700 |
| commit | 818551e2b2c662a1b26de6b4f7d6b8411a838d18 (patch) | |
| tree | f38b4c951df4d33db81ae7b7765a56bce491c2a8 /drivers/ata | |
| parent | 6010720da8aab51f33beee63b73cf88016e9b250 (diff) | |
| parent | 7520872c0cf4d3df6d74242c6edfb9e70a47df4d (diff) | |
Merge branch 'for-4.11/next' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 1f863e757ee4..c771d4c341ea 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1265,13 +1265,13 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev) */ static int atapi_drain_needed(struct request *rq) { - if (likely(rq->cmd_type != REQ_TYPE_BLOCK_PC)) + if (likely(!blk_rq_is_passthrough(rq))) return 0; if (!blk_rq_bytes(rq) || op_is_write(req_op(rq))) return 0; - return atapi_cmd_type(rq->cmd[0]) == ATAPI_MISC; + return atapi_cmd_type(scsi_req(rq)->cmd[0]) == ATAPI_MISC; } static int ata_scsi_dev_config(struct scsi_device *sdev, |