diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-17 22:08:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-17 22:08:19 +0100 |
| commit | 818551e2b2c662a1b26de6b4f7d6b8411a838d18 (patch) | |
| tree | f38b4c951df4d33db81ae7b7765a56bce491c2a8 /drivers/scsi/mpt3sas/mpt3sas_scsih.c | |
| parent | Merge branch 'for-4.11/block' into for-4.11/linus-merge (diff) | |
| parent | block: don't defer flushes on blk-mq + scheduling (diff) | |
| download | linux-818551e2b2c662a1b26de6b4f7d6b8411a838d18.tar.xz linux-818551e2b2c662a1b26de6b4f7d6b8411a838d18.zip | |
Merge branch 'for-4.11/next' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_scsih.c')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 0b5b423b1db0..c6d550551504 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -4723,7 +4723,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) * then scsi-ml does not need to handle this misbehavior. */ sector_sz = scmd->device->sector_size; - if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz && + if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz && xfer_cnt % sector_sz)) { sdev_printk(KERN_INFO, scmd->device, "unaligned partial completion avoided (xfer_cnt=%u, sector_sz=%u)\n", |