Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563180a4 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

cfq-iosched: minor cleanups 



* Some were accessing cic->cfqq[] directly.  Always use cic_to_cfqq()
  and cic_set_cfqq().

* check_ioprio_changed() doesn't need to verify cfq_get_queue()'s
  return for NULL.  It's always non-NULL.  Simplify accordingly.

This patch doesn't cause any functional changes.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Arianna Avanzini <avanzini.arianna@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bce6133b

block/cfq-iosched.c

+11 −15
Original line number Diff line number Diff line
@@ -3506,14 +3506,14 @@ static void cfq_exit_icq(struct io_cq *icq) 
	struct cfq_io_cq *cic = icq_to_cic(icq);

	struct cfq_data *cfqd = cic_to_cfqd(cic);



	if (cic->cfqq[BLK_RW_ASYNC]) {

		cfq_exit_cfqq(cfqd, cic->cfqq[BLK_RW_ASYNC]);

		cic->cfqq[BLK_RW_ASYNC] = NULL;

	if (cic_to_cfqq(cic, false)) {

		cfq_exit_cfqq(cfqd, cic_to_cfqq(cic, false));

		cic_set_cfqq(cic, NULL, false);

	}



	if (cic->cfqq[BLK_RW_SYNC]) {

		cfq_exit_cfqq(cfqd, cic->cfqq[BLK_RW_SYNC]);

		cic->cfqq[BLK_RW_SYNC] = NULL;

	if (cic_to_cfqq(cic, true)) {

		cfq_exit_cfqq(cfqd, cic_to_cfqq(cic, true));

		cic_set_cfqq(cic, NULL, true);

	}

}
@@ -3572,18 +3572,14 @@ static void check_ioprio_changed(struct cfq_io_cq *cic, struct bio *bio) 
	if (unlikely(!cfqd) || likely(cic->ioprio == ioprio))

		return;



	cfqq = cic->cfqq[BLK_RW_ASYNC];

	cfqq = cic_to_cfqq(cic, false);

	if (cfqq) {

		struct cfq_queue *new_cfqq;

		new_cfqq = cfq_get_queue(cfqd, BLK_RW_ASYNC, cic, bio,

					 GFP_ATOMIC);

		if (new_cfqq) {

			cic->cfqq[BLK_RW_ASYNC] = new_cfqq;

		cfq_put_queue(cfqq);

		}

		cfqq = cfq_get_queue(cfqd, BLK_RW_ASYNC, cic, bio, GFP_ATOMIC);

		cic_set_cfqq(cic, cfqq, false);

	}



	cfqq = cic->cfqq[BLK_RW_SYNC];

	cfqq = cic_to_cfqq(cic, true);

	if (cfqq)

		cfq_mark_cfqq_prio_changed(cfqq);