UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Josef Bacik 2018-07-19 21:42:13 -04:00 committed by Jens Axboe
parent 636620b66d
commit 22f17952c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-rq-qos.c
View File

@ -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);
}

2
block/blk-rq-qos.h
View File

@ -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);