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

!10927 block: Fix lockdep warning in blk_mq_mark_tag_wait 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LFKFYGJ2FPERY73RYE3I6ZSQHEBXELHC/ 
 
https://gitee.com/openeuler/kernel/issues/IAKP6C 
 
Link:https://gitee.com/openeuler/kernel/pulls/10927

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 446aa954 8a487fa5

block/blk-mq-tag.c

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static void blk_mq_update_wake_batch(struct blk_mq_tags *tags, 
void __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

{

	unsigned int users;

	unsigned long flags;

	struct blk_mq_tags *tags = hctx->tags;



	/*
@@ -56,11 +57,11 @@ void __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx) 
			return;

	}



	spin_lock_irq(&tags->lock);

	spin_lock_irqsave(&tags->lock, flags);

	users = tags->active_queues + 1;

	WRITE_ONCE(tags->active_queues, users);

	blk_mq_update_wake_batch(tags, users);

	spin_unlock_irq(&tags->lock);

	spin_unlock_irqrestore(&tags->lock, flags);

}



/*