Skip to content

Commit

Permalink
block: mq-deadline: Clean up deadline_check_fifo()
Browse files Browse the repository at this point in the history
Change the return type of deadline_check_fifo() from 'int' into 'bool'.
Use time_is_before_eq_jiffies() instead of time_after_eq(). No
functionality has been changed.

Reviewed-by: Christoph Hellwig <[email protected]>
Reviewed-by: Hannes Reinecke <[email protected]>
Cc: Damien Le Moal <[email protected]>
Cc: Ming Lei <[email protected]>
Signed-off-by: Bart Van Assche <[email protected]>
Reviewed-by: Damien Le Moal <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
bvanassche authored and axboe committed May 19, 2023
1 parent 19821fe commit e0d85cd
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions block/mq-deadline.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,21 +272,15 @@ static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
}

/*
* deadline_check_fifo returns 0 if there are no expired requests on the fifo,
* 1 otherwise. Requires !list_empty(&dd->fifo_list[data_dir])
* deadline_check_fifo returns true if and only if there are expired requests
* in the FIFO list. Requires !list_empty(&dd->fifo_list[data_dir]).
*/
static inline int deadline_check_fifo(struct dd_per_prio *per_prio,
enum dd_data_dir data_dir)
static inline bool deadline_check_fifo(struct dd_per_prio *per_prio,
enum dd_data_dir data_dir)
{
struct request *rq = rq_entry_fifo(per_prio->fifo_list[data_dir].next);

/*
* rq is expired!
*/
if (time_after_eq(jiffies, (unsigned long)rq->fifo_time))
return 1;

return 0;
return time_is_before_eq_jiffies((unsigned long)rq->fifo_time);
}

/*
Expand Down

0 comments on commit e0d85cd

Please sign in to comment.