Commit e0d85cde authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: mq-deadline: Clean up deadline_check_fifo() 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230517174230.897144-7-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 19821fee

block/mq-deadline.c

+5 −11
Original line number Diff line number Diff line
@@ -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,

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

}



/*