summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-15 13:54:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-15 13:54:53 -0700
commit1efdb5f0a9243ca8f3460a5ce1b407b06a021f02 (patch)
tree123bff297218a3f83b731006c36e1a7c4955a894 /block
parent45e38cff4fce8d6871b5fa5e734e4dc9814d6056 (diff)
parent4f258a46346c03fa0bbb6199ffaf4e1f9f599660 (diff)
downloadlinux-1efdb5f0a9243ca8f3460a5ce1b407b06a021f02.tar.bz2
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "This has two libfc fixes for bugs causing rare crashes, one iscsi fix for a potential hang on shutdown, and a fix for an I/O blocksize issue which caused a regression" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: sd: Fix maximum I/O size for BLOCK_PC requests libfc: Fix fc_fcp_cleanup_each_cmd() libfc: Fix fc_exch_recv_req() error path libiscsi: Fix host busy blocking during connection teardown
Diffstat (limited to 'block')
-rw-r--r--block/blk-settings.c4
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