Commit 783a40a1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: check if a profile is actually registered in blk_integrity_unregister 



While clearing the profile itself is harmless, we really should not clear
the stable writes flag if it wasn't set due to a registered integrity
profile.

Reported-by: default avatarLihong Kou <koulihong@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20210914070657.87677-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 67f3b2f8

block/blk-integrity.c

+5 −1
Original line number Diff line number Diff line
@@ -426,8 +426,12 @@ EXPORT_SYMBOL(blk_integrity_register); 
 */

void blk_integrity_unregister(struct gendisk *disk)

{

	struct blk_integrity *bi = &disk->queue->integrity;



	if (!bi->profile)

		return;

	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);

	memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));

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

}

EXPORT_SYMBOL(blk_integrity_unregister);