diff options
author | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /drivers/scsi/scsi_lib.c | |
parent | serial: 8250: Add new port type for TI DA8xx/66AK2x (diff) | |
parent | Linux 4.10-rc4 (diff) | |
download | kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.gz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.xz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.zip |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c35b6de4ca64..e9e1e141af9c 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1018,7 +1018,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb) count = blk_rq_map_sg(req->q, req, sdb->table.sgl); BUG_ON(count > sdb->table.nents); sdb->table.nents = count; - sdb->length = blk_rq_bytes(req); + sdb->length = blk_rq_payload_bytes(req); return BLKPREP_OK; } @@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev) * request queue. */ if (q->mq_ops) { - blk_mq_stop_hw_queues(q); + blk_mq_quiesce_queue(q); } else { spin_lock_irqsave(q->queue_lock, flags); blk_stop_queue(q); |