Commit 6d7a428c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Wen Zhiwei
Browse files

block: remove the blk_flush_integrity call in blk_integrity_unregister 

stable inclusion
from stable-v6.6.50
commit 2e91ea29622ca93c8bb64c8afdc537c1afcaa20d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYKL6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2e91ea29622ca93c8bb64c8afdc537c1afcaa20d



--------------------------------

[ Upstream commit e8bc14d116aeac8f0f133ec8d249acf4e0658da7 ]

Now that there are no indirect calls for PI processing there is no
way to dereference a NULL pointer here.  Additionally drivers now always
freeze the queue (or in case of stacking drivers use their internal
equivalent) around changing the integrity profile.

This is effectively a revert of commit 3df49967 ("block: flush the
integrity workqueue in blk_integrity_unregister").

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240613084839.1044015-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 24fb24b0

block/blk-integrity.c

+0 −2
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ void blk_integrity_unregister(struct gendisk *disk) 
	if (!bi->profile)

		return;



	/* ensure all bios are off the integrity workqueue */

	blk_flush_integrity();

	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);

	memset(bi, 0, sizeof(*bi));

}