iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/mq-deadline: Remove two local variables

Browse Source 
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>
This commit is contained in:
Bart Van Assche 2021-06-17 17:44:47 -07:00 committed by Jens Axboe
parent 3bd473f41a
commit 2f295beab4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/mq-deadline.c
View File

@ -276,7 +276,6 @@ deadline_next_request(struct deadline_data *dd, int data_dir)
static struct request *__dd_dispatch_request(struct deadline_data *dd) static struct request *__dd_dispatch_request(struct deadline_data *dd)
{ {
struct request *rq, *next_rq; struct request *rq, *next_rq;
bool reads, writes;
int data_dir; int data_dir;
lockdep_assert_held(&dd->lock); lockdep_assert_held(&dd->lock);
@ -287,9 +286,6 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd)
goto done; goto done;
} }
reads = !list_empty(&dd->fifo_list[READ]);
writes = !list_empty(&dd->fifo_list[WRITE]);
/* /*
* batches are currently reads XOR writes * batches are currently reads XOR writes
*/ */
@ -306,7 +302,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd)
* data direction (read / write) * data direction (read / write)
*/ */
if (reads) { if (!list_empty(&dd->fifo_list[READ])) {
BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[READ])); BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[READ]));
if (deadline_fifo_request(dd, WRITE) && 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 * there are either no reads or writes have been starved
*/ */
if (writes) { if (!list_empty(&dd->fifo_list[WRITE])) {
dispatch_writes: dispatch_writes:
BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[WRITE])); BUG_ON(RB_EMPTY_ROOT(&dd->sort_list[WRITE]));