On Thu, Jun 17, 2021 at 05:44:47PM -0700, Bart Van Assche wrote:
> Make __dd_dispatch_request() easier to read by removing two local
> variables.
>
> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
> Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxx>
> Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
> Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> Cc: Damien Le Moal <damien.lemoal@xxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> Cc: Ming Lei <ming.lei@xxxxxxxxxx>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
> block/mq-deadline.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/block/mq-deadline.c b/block/mq-deadline.c
> index 191ff5ce629c..caa438f62a4d 100644
> --- 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]));
>
Looks good.
Reviewed by: Adam Manzanares <a.manzanares@xxxxxxxxxxx>
