| Message ID | 20240607055912.3586772-6-hch@lst.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | [01/11] dm-integrity: use the nop integrity profile | expand |
| Context | Check | Description |
|---|---|---|
| mdraidci/vmtest-md-6_11-PR | fail | merge-conflict |
On 6/7/24 07:58, Christoph Hellwig wrote: > 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> > --- > block/blk-integrity.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/block/blk-integrity.c b/block/blk-integrity.c > index 17d37badfbb8bc..24f04575096d39 100644 > --- a/block/blk-integrity.c > +++ b/block/blk-integrity.c > @@ -401,8 +401,6 @@ void blk_integrity_unregister(struct gendisk *disk) > if (!bi->tuple_size) > 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)); > } Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
Christoph, > 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"). Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 17d37badfbb8bc..24f04575096d39 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -401,8 +401,6 @@ void blk_integrity_unregister(struct gendisk *disk) if (!bi->tuple_size) 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)); }
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> --- block/blk-integrity.c | 2 -- 1 file changed, 2 deletions(-)