xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block, bfq: replace 0/1 with false/true in bic apis

Browse Source 
[ Upstream commit 337366e02b370d2800110fbc99940f6ddddcbdfa ]

Just to make the code a litter cleaner, there are no functional changes.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20221214033155.3455754-3-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: b600de2d7d3a ("block, bfq: fix uaf for bfqq in bic_set_bfqq()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yu Kuai
2023-03-13 15:27:56 -07:00
committed by Greg Kroah-Hartman
parent e6f03decf5
commit 6291281f15
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
block/bfq-cgroup.c
View File

@@ -705,15 +705,15 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
struct bfq_io_cq *bic, struct bfq_io_cq *bic,
struct bfq_group *bfqg) struct bfq_group *bfqg)
{ {
struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0); struct bfq_queue *async_bfqq = bic_to_bfqq(bic, false);
struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1); struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, true);
struct bfq_entity *entity; struct bfq_entity *entity;
if (async_bfqq) { if (async_bfqq) {
entity = &async_bfqq->entity; entity = &async_bfqq->entity;
if (entity->sched_data != &bfqg->sched_data) { if (entity->sched_data != &bfqg->sched_data) {
bic_set_bfqq(bic, NULL, 0); bic_set_bfqq(bic, NULL, false);
bfq_release_process_ref(bfqd, async_bfqq); bfq_release_process_ref(bfqd, async_bfqq);
} }
} }
@@ -749,7 +749,7 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
*/ */
bfq_put_cooperator(sync_bfqq); bfq_put_cooperator(sync_bfqq);
bfq_release_process_ref(bfqd, sync_bfqq); bfq_release_process_ref(bfqd, sync_bfqq);
bic_set_bfqq(bic, NULL, 1); bic_set_bfqq(bic, NULL, true);
} }
} }
} }

4
block/bfq-iosched.c
View File

@@ -2816,7 +2816,7 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
/* /*
* Merge queues (that is, let bic redirect its requests to new_bfqq) * Merge queues (that is, let bic redirect its requests to new_bfqq)
*/ */
bic_set_bfqq(bic, new_bfqq, 1); bic_set_bfqq(bic, new_bfqq, true);
bfq_mark_bfqq_coop(new_bfqq); bfq_mark_bfqq_coop(new_bfqq);
/* /*
* new_bfqq now belongs to at least two bics (it is a shared queue): * new_bfqq now belongs to at least two bics (it is a shared queue):
@@ -6014,7 +6014,7 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
return bfqq; return bfqq;
} }
bic_set_bfqq(bic, NULL, 1); bic_set_bfqq(bic, NULL, true);
bfq_put_cooperator(bfqq); bfq_put_cooperator(bfqq);