Merge branch 'mkp-fixes' into fixes

This commit is contained in:
James Bottomley 2015-12-03 09:32:33 -08:00
commit be9e2f775f
19 changed files with 126 additions and 59 deletions

View file

@ -205,6 +205,9 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
if (ret < 0)
return ret;
max_hw_sectors_kb = min_not_zero(max_hw_sectors_kb, (unsigned long)
q->limits.max_dev_sectors >> 1);
if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb)
return -EINVAL;