Commit bc3b1e9e authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator() 



Because bfq_put_cooperator() is always followed by
bfq_release_process_ref().

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240909134154.954924-4-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 73aeab37

block/bfq-cgroup.c

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ static void bfq_sync_bfqq_move(struct bfq_data *bfqd, 
		 */

		bfq_put_cooperator(sync_bfqq);

		bic_set_bfqq(bic, NULL, true, act_idx);

		bfq_release_process_ref(bfqd, sync_bfqq);

	}

}

block/bfq-iosched.c

+2 −4
Original line number Diff line number Diff line
@@ -5434,6 +5434,8 @@ void bfq_put_cooperator(struct bfq_queue *bfqq) 
		bfq_put_queue(__bfqq);

		__bfqq = next;

	}



	bfq_release_process_ref(bfqq->bfqd, bfqq);

}



static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
@@ -5446,8 +5448,6 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq) 
	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq, bfqq->ref);



	bfq_put_cooperator(bfqq);



	bfq_release_process_ref(bfqd, bfqq);

}



static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync,
@@ -6734,8 +6734,6 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq) 
	bic_set_bfqq(bic, NULL, true, bfqq->actuator_idx);



	bfq_put_cooperator(bfqq);



	bfq_release_process_ref(bfqq->bfqd, bfqq);

	return NULL;

}