projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-sysfs.c
diff --git
a/block/blk-sysfs.c
b/block/blk-sysfs.c
index 418d63619680e8df2b9ab2ba0cdd5f31bcfb4ee4..b78c9c3e26705f45fb1e90ac116dc8bb96c8122b 100644
(file)
--- a/
block/blk-sysfs.c
+++ b/
block/blk-sysfs.c
@@
-40,7
+40,12
@@
queue_requests_store(struct request_queue *q, const char *page, size_t count)
{
struct request_list *rl = &q->rq;
unsigned long nr;
{
struct request_list *rl = &q->rq;
unsigned long nr;
- int ret = queue_var_store(&nr, page, count);
+ int ret;
+
+ if (!q->request_fn)
+ return -EINVAL;
+
+ ret = queue_var_store(&nr, page, count);
if (nr < BLKDEV_MIN_RQ)
nr = BLKDEV_MIN_RQ;
if (nr < BLKDEV_MIN_RQ)
nr = BLKDEV_MIN_RQ;
@@
-133,7
+138,7
@@
queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
return -EINVAL;
spin_lock_irq(q->queue_lock);
return -EINVAL;
spin_lock_irq(q->queue_lock);
-
blk_queue_max_sectors(q, max_sectors_kb << 1)
;
+
q->limits.max_sectors = max_sectors_kb << 1
;
spin_unlock_irq(q->queue_lock);
return ret;
spin_unlock_irq(q->queue_lock);
return ret;