From: Zhang Wensheng zhangwensheng5@huawei.com
hulk inclusion category: bugfix bugzilla: 185922, https://gitee.com/openeuler/kernel/issues/I4NDPF CVE: NA
--------------------------------
fix the problem introduced by commit 80086651acbd ("blk: Fix lock inversion between ioc lock and bfqd lock"), which lead to blk_queue_bio using blk_mq_free_request to free abnormally.
fix the problem using __blk_put_request to replace it.
Fixes: 80086651acbdb ("blk: Fix lock inversion between ioc lock and bfqd lock") Signed-off-by: Zhang Wensheng zhangwensheng5@huawei.com Reviewed-by: Laibin Qiu qiulaibin@huawei.com Reviewed-by: Jason Yan yanaijie@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- block/blk-mq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-mq.h b/block/blk-mq.h index bb8aabbc5c579..b3540d62c541e 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -228,7 +228,7 @@ static inline void blk_mq_free_requests(struct list_head *list) struct request *rq = list_entry_rq(list->next);
list_del_init(&rq->queuelist); - blk_mq_free_request(rq); + __blk_put_request(rq->q, rq); } }