diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-01-13 12:29:11 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-13 15:17:04 -0700 |
| commit | fd102b125e174edbea34e6e7a2d371bc7901c53d (patch) | |
| tree | 724ba8803cc9ac269baff0fe5ff30d1d2fb39932 | |
| parent | 2e3258ecfaebace1ceffaa14e0ea94775d54f46f (diff) | |
| download | linux-fd102b125e174edbea34e6e7a2d371bc7901c53d.tar.bz2 | |
scsi: use blk_rq_payload_bytes
Without that we'll pass a wrong payload size in cmd->sdb, which
can lead to hangs with drivers that need the total transfer size.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Chris Valean <v-chvale@microsoft.com>
Reported-by: Dexuan Cui <decui@microsoft.com>
Fixes: f9d03f96 ("block: improve handling of the magic discard payload")
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c35b6de4ca64..ad4ff8fcd4dd 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; } |