block/mq-deadline: Remove two local variables

Make __dd_dispatch_request() easier to read by removing two local
variables.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20210618004456.7280-8-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 191ff5ce629c822be1abe4e0244fac677339f4b3..caa438f62a4d767361bdc5606a16d2fe89ae019d 100644 (file)
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -276,7 +276,6 @@ deadline_next_request(struct deadline_data *dd, int data_dir)
 static struct request *__dd_dispatch_request(struct deadline_data *dd)
 {
        struct request *rq, *next_rq;
-       bool reads, writes;
        int data_dir;
 
        lockdep_assert_held(&dd->lock);
@@ -287,9 +286,6 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd)
                goto done;
        }
 
-       reads = !list_empty(&dd->fifo_list[READ]);
-       writes = !list_empty(&dd->fifo_list[WRITE]);
-
        /*
         * batches are currently reads XOR writes
         */
@@ -306,7 +302,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd)
         * data direction (read / write)
         */
 
-       if (reads) {
+       if (!list_empty(&dd->fifo_list[READ])) {
                BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[READ]));
 
                if (deadline_fifo_request(dd, WRITE) &&
@@ -322,7 +318,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd)
         * there are either no reads or writes have been starved
         */
 
-       if (writes) {
+       if (!list_empty(&dd->fifo_list[WRITE])) {
 dispatch_writes:
                BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[WRITE]));