]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
block: remove the blk_flush_integrity call in blk_integrity_unregister
authorChristoph Hellwig <hch@lst.de>
Thu, 13 Jun 2024 08:48:16 +0000 (10:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:06:41 +0000 (11:06 +0200)
[ 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 3df49967f6f1 ("block: flush the
integrity workqueue in blk_integrity_unregister").

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240613084839.1044015-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
block/blk-integrity.c

index 9e83159f5a527db04563023dbc075cf314e8773b..2bcf3760538c25b61dc8223f3494a0924af31a0e 100644 (file)
@@ -431,8 +431,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));
 }