path: root/block/blk-settings.c
diff options
authorMartin K. Petersen <martin.petersen@oracle.com>2015-06-23 12:13:59 -0400
committerJames Bottomley <JBottomley@Odin.com>2015-08-12 11:54:37 -0700
commit4f258a46346c03fa0bbb6199ffaf4e1f9f599660 (patch)
tree87f6203edaaa3e9156c5f1710427a1915195e98e /block/blk-settings.c
parent8f2777f53e3d5ad8ef2a176a4463a5c8e1a16431 (diff)
sd: Fix maximum I/O size for BLOCK_PC requests
Commit bcdb247c6b6a ("sd: Limit transfer length") clamped the maximum size of an I/O request to the MAXIMUM TRANSFER LENGTH field in the BLOCK LIMITS VPD. This had the unfortunate effect of also limiting the maximum size of non-filesystem requests sent to the device through sg/bsg. Avoid using blk_queue_max_hw_sectors() and set the max_sectors queue limit directly. Also update the comment in blk_limits_max_hw_sectors() to clarify that max_hw_sectors defines the limit for the I/O controller only. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Reported-by: Brian King <brking@linux.vnet.ibm.com> Tested-by: Brian King <brking@linux.vnet.ibm.com> Cc: stable@vger.kernel.org # 3.17+ Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'block/blk-settings.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 12600bfffca9..e0057d035200 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -241,8 +241,8 @@ EXPORT_SYMBOL(blk_queue_bounce_limit);
* Description:
* Enables a low level driver to set a hard upper limit,
* max_hw_sectors, on the size of requests. max_hw_sectors is set by
- * the device driver based upon the combined capabilities of I/O
- * controller and storage device.
+ * the device driver based upon the capabilities of the I/O
+ * controller.
* max_sectors is a soft limit imposed by the block layer for
* filesystem type requests. This value can be overridden on a