diff options
| author | Yufen Yu <yuyufen@huawei.com> | 2019-03-18 22:44:41 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-03-20 14:02:07 -0600 |
| commit | 29ece8b4354f8c5eaee798a3d8a1b356efee426f (patch) | |
| tree | 953360a0c9964a71527205e3f427269c80d0f10f /block/blk-sysfs.c | |
| parent | 9496c015ed39ddfce971d63a1442e6d258504a7d (diff) | |
| download | linux-stable-29ece8b4354f8c5eaee798a3d8a1b356efee426f.tar.gz linux-stable-29ece8b4354f8c5eaee798a3d8a1b356efee426f.tar.bz2 linux-stable-29ece8b4354f8c5eaee798a3d8a1b356efee426f.zip | |
block: add BLK_MQ_POLL_CLASSIC for hybrid poll and return EINVAL for unexpected value
For q->poll_nsec == -1, means doing classic poll, not hybrid poll.
We introduce a new flag BLK_MQ_POLL_CLASSIC to replace -1, which
may make code much easier to read.
Additionally, since val is an int obtained with kstrtoint(), val can be
a negative value other than -1, so return -EINVAL for that case.
Thanks to Damien Le Moal for some good suggestion.
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 59685918167e..422327089e0f 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -360,8 +360,8 @@ static ssize_t queue_poll_delay_show(struct request_queue *q, char *page) { int val; - if (q->poll_nsec == -1) - val = -1; + if (q->poll_nsec == BLK_MQ_POLL_CLASSIC) + val = BLK_MQ_POLL_CLASSIC; else val = q->poll_nsec / 1000; @@ -380,10 +380,12 @@ static ssize_t queue_poll_delay_store(struct request_queue *q, const char *page, if (err < 0) return err; - if (val == -1) - q->poll_nsec = -1; - else + if (val == BLK_MQ_POLL_CLASSIC) + q->poll_nsec = BLK_MQ_POLL_CLASSIC; + else if (val >= 0) q->poll_nsec = val * 1000; + else + return -EINVAL; return count; } |