scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable
authorFam Zheng <famz@redhat.com>
Tue, 28 Mar 2017 04:41:26 +0000 (12:41 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Apr 2017 07:31:21 +0000 (09:31 +0200)
commit82d181d7540fed18ee48487d252dc60920c16d18
tree2f68475d4196a8ab5f3b6de7e1b63a45fcb1ce18
parentc80c158bfe613d346d48803462bf55d8f35d228e
scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable

commit 6780414519f91c2a84da9baa963a940ac916f803 upstream.

If device reports a small max_xfer_blocks and a zero opt_xfer_blocks, we
end up using BLK_DEF_MAX_SECTORS, which is wrong and r/w of that size
may get error.

[mkp: tweaked to avoid setting rw_max twice and added typecast]

Fixes: ca369d51b3e ("block/sd: Fix device-imposed transfer length limits")
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/sd.c