From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.de>,
Damien Le Moal <dlemoal@kernel.org>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH v6 06/11] block: mq-deadline: Clean up deadline_check_fifo()
Date: Wed, 17 May 2023 10:42:24 -0700 [thread overview]
Message-ID: <20230517174230.897144-7-bvanassche@acm.org> (raw)
In-Reply-To: <20230517174230.897144-1-bvanassche@acm.org>
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 <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
block/mq-deadline.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index cea1b084c69e..cea91ba4a6ea 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -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);
}
/*
next prev parent reply other threads:[~2023-05-17 17:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 17:42 [PATCH v6 00/11] mq-deadline: Improve support for zoned block devices Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 01/11] block: mq-deadline: Add a word in a source code comment Bart Van Assche
2023-05-18 23:11 ` Damien Le Moal
2023-05-18 23:20 ` Bart Van Assche
2023-05-18 23:39 ` Damien Le Moal
2023-05-17 17:42 ` [PATCH v6 02/11] block: Simplify blk_req_needs_zone_write_lock() Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 03/11] block: Fix the type of the second bdev_op_is_zoned_write() argument Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 04/11] block: Introduce op_needs_zoned_write_locking() Bart Van Assche
2023-05-18 23:12 ` Damien Le Moal
2023-05-17 17:42 ` [PATCH v6 05/11] block: Introduce blk_rq_is_seq_zoned_write() Bart Van Assche
2023-05-18 23:13 ` Damien Le Moal
2023-05-17 17:42 ` Bart Van Assche [this message]
2023-05-18 23:14 ` [PATCH v6 06/11] block: mq-deadline: Clean up deadline_check_fifo() Damien Le Moal
2023-05-17 17:42 ` [PATCH v6 07/11] block: mq-deadline: Simplify deadline_skip_seq_writes() Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 08/11] block: mq-deadline: Reduce lock contention Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 09/11] block: mq-deadline: Track the dispatch position Bart Van Assche
2023-05-17 17:42 ` [PATCH v6 10/11] block: mq-deadline: Handle requeued requests correctly Bart Van Assche
2023-05-18 23:15 ` Damien Le Moal
2023-05-17 17:42 ` [PATCH v6 11/11] block: mq-deadline: Fix handling of at-head zoned writes Bart Van Assche
2023-05-19 1:50 ` [PATCH v6 00/11] mq-deadline: Improve support for zoned block devices Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517174230.897144-7-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox