Unverified Commit 44aa1e9f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!988 [sync] PR-954: block: iocost bugfix 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/954 
 
PR sync from:  Li Nan <linan122@huawei.com>
 https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/thread/VXKLPFKREQW36DJSNHXJEEDMYS5EJXSZ/ 
This patch series fix iocost life cycle bug.

Li Nan (2):
  block: fix null-pointer dereference in ioc_pd_init
  block: fix order error in blk_release_queue


-- 
2.39.2
 
 
Link:https://gitee.com/openeuler/kernel/pulls/988

 

Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0ecc1bd3 d8b257f1

block/blk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -402,8 +402,6 @@ void blk_cleanup_queue(struct request_queue *q) 
	 */

	blk_freeze_queue(q);



	rq_qos_exit(q);



	blk_queue_flag_set(QUEUE_FLAG_DEAD, q);



	/* for synchronous bio-based driver finish in-flight integrity i/o */

block/blk-sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -786,6 +786,8 @@ static void blk_release_queue(struct kobject *kobj) 


	might_sleep();



	rq_qos_exit(q);



	if (test_bit(QUEUE_FLAG_POLL_STATS, &q->queue_flags))

		blk_stat_remove_callback(q, q->poll_cb);

	blk_stat_free_callback(q->poll_cb);