From: Mike Christie <michaelc@xxxxxxxxxxx>
If the user has set max_sectors in sysfs, but the disk is revalidated
due to it being removable or having write protections and it being
opened, or dm/md claiming it, or something like a scsi rescan, etc,
then we are overwriting the user specified max_sectors value. This patch
only has us set the max_sectors if the new max_hw_sectors is smaller
or if the user has not changed max_sectors.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
---
block/blk-settings.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 12600bf..d6c7b0c 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -248,6 +248,10 @@ EXPORT_SYMBOL(blk_queue_bounce_limit);
* filesystem type requests. This value can be overridden on a
* per-device basis in /sys/block/<device>/queue/max_sectors_kb.
* The soft limit can not exceed max_hw_sectors.
+ *
+ * If this is called as a result of a revalidation then we will only
+ * override the user specified max_sectors if the new max_hw_sectors is
+ * smaller.
**/
void blk_limits_max_hw_sectors(struct queue_limits *limits, unsigned int max_hw_sectors)
{
@@ -257,7 +261,11 @@ void blk_limits_max_hw_sectors(struct queue_limits *limits, unsigned int max_hw_
__func__, max_hw_sectors);
}
- limits->max_sectors = limits->max_hw_sectors = max_hw_sectors;
+ if (limits->max_sectors == limits->max_hw_sectors ||
+ max_hw_sectors < limits->max_sectors)
+ limits->max_sectors = limits->max_hw_sectors = max_hw_sectors;
+ else
+ limits->max_hw_sectors = max_hw_sectors;
}
EXPORT_SYMBOL(blk_limits_max_hw_sectors);
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
