diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2018-07-20 03:42:13 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-07-22 19:30:53 +0200 |
| commit | 22f17952c7873a427e6e4280d723c0f686d75fb9 (patch) | |
| tree | ba3046530a5f3dadb9b3e66289027b49531a423c | |
| parent | blkcg: Track DISCARD statistics and output them in cgroup io.stat (diff) | |
| download | linux-22f17952c7873a427e6e4280d723c0f686d75fb9.tar.xz linux-22f17952c7873a427e6e4280d723c0f686d75fb9.zip | |
blk-rq-qos: make depth comparisons unsigned
With the change to use UINT_MAX I broke the depth check as any value of
inflight (ie 0) would be less than (int)UINT_MAX. Fix this by changing
everything to unsigned int to match the depth.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/blk-rq-qos.c | 8 | ||||
| -rw-r--r-- | block/blk-rq-qos.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index 5134b24482f6..0005dfd568dd 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -4,12 +4,12 @@ * Increment 'v', if 'v' is below 'below'. Returns true if we succeeded, * false if 'v' + 1 would be bigger than 'below'. */ -static bool atomic_inc_below(atomic_t *v, int below) +static bool atomic_inc_below(atomic_t *v, unsigned int below) { - int cur = atomic_read(v); + unsigned int cur = atomic_read(v); for (;;) { - int old; + unsigned int old; if (cur >= below) return false; @@ -22,7 +22,7 @@ static bool atomic_inc_below(atomic_t *v, int below) return true; } -bool rq_wait_inc_below(struct rq_wait *rq_wait, int limit) +bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit) { return atomic_inc_below(&rq_wait->inflight, limit); } diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index d5e2f68fe41e..32b02efbfa66 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -93,7 +93,7 @@ static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos) } } -bool rq_wait_inc_below(struct rq_wait *rq_wait, int limit); +bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit); void rq_depth_scale_up(struct rq_depth *rqd); void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle); bool rq_depth_calc_max_depth(struct rq_depth *rqd); |