diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-02-17 08:52:31 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-02-17 07:54:03 -0700 |
| commit | 7a5428dcb7902700b830e912feee4e845df7c019 (patch) | |
| tree | 8081b612885ee3f9f8a61e1a72620eecc22e72ca /block/genhd.c | |
| parent | block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern (diff) | |
| download | linux-dev-7a5428dcb7902700b830e912feee4e845df7c019.tar.xz linux-dev-7a5428dcb7902700b830e912feee4e845df7c019.zip | |
block: fix surprise removal for drivers calling blk_set_queue_dying
Various block drivers call blk_set_queue_dying to mark a disk as dead due
to surprise removal events, but since commit 8e141f9eb803 that doesn't
work given that the GD_DEAD flag needs to be set to stop I/O.
Replace the driver calls to blk_set_queue_dying with a new (and properly
documented) blk_mark_disk_dead API, and fold blk_set_queue_dying into the
only remaining caller.
Fixes: 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
Reported-by: Markus Blöchl <markus.bloechl@ipetronik.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20220217075231.1140-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index 626c8406f21a..9eca1f7d35c9 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -549,6 +549,20 @@ out_free_ext_minor: EXPORT_SYMBOL(device_add_disk); /** + * blk_mark_disk_dead - mark a disk as dead + * @disk: disk to mark as dead + * + * Mark as disk as dead (e.g. surprise removed) and don't accept any new I/O + * to this disk. + */ +void blk_mark_disk_dead(struct gendisk *disk) +{ + set_bit(GD_DEAD, &disk->state); + blk_queue_start_drain(disk->queue); +} +EXPORT_SYMBOL_GPL(blk_mark_disk_dead); + +/** * del_gendisk - remove the gendisk * @disk: the struct gendisk to remove * |