mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
block: call into the file system for bdev_mark_dead
Combine the newly merged bdev_mark_dead helper with the existing mark_dead holder operation so that all operations that invalidate a device that is dead or being removed now go through the holder ops. This allows file systems to explicitly shutdown either ASAP (for a surprise removal) or after writing back data (for an orderly removal), and do so not only for the main device. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Message-Id: <20230811100828.1897174-15-hch@lst.de> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
committed by
Christian Brauner
parent
560e20e4bf
commit
d8530de5a6
@@ -554,7 +554,7 @@ out_exit_elevator:
|
||||
}
|
||||
EXPORT_SYMBOL(device_add_disk);
|
||||
|
||||
static void blk_report_disk_dead(struct gendisk *disk)
|
||||
static void blk_report_disk_dead(struct gendisk *disk, bool surprise)
|
||||
{
|
||||
struct block_device *bdev;
|
||||
unsigned long idx;
|
||||
@@ -565,10 +565,7 @@ static void blk_report_disk_dead(struct gendisk *disk)
|
||||
continue;
|
||||
rcu_read_unlock();
|
||||
|
||||
mutex_lock(&bdev->bd_holder_lock);
|
||||
if (bdev->bd_holder_ops && bdev->bd_holder_ops->mark_dead)
|
||||
bdev->bd_holder_ops->mark_dead(bdev);
|
||||
mutex_unlock(&bdev->bd_holder_lock);
|
||||
bdev_mark_dead(bdev, surprise);
|
||||
|
||||
put_device(&bdev->bd_device);
|
||||
rcu_read_lock();
|
||||
@@ -576,14 +573,7 @@ static void blk_report_disk_dead(struct gendisk *disk)
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
static void __blk_mark_disk_dead(struct gendisk *disk)
|
||||
{
|
||||
/*
|
||||
* Fail any new I/O.
|
||||
@@ -603,8 +593,19 @@ void blk_mark_disk_dead(struct gendisk *disk)
|
||||
* Prevent new I/O from crossing bio_queue_enter().
|
||||
*/
|
||||
blk_queue_start_drain(disk->queue);
|
||||
}
|
||||
|
||||
blk_report_disk_dead(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)
|
||||
{
|
||||
__blk_mark_disk_dead(disk);
|
||||
blk_report_disk_dead(disk, true);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(blk_mark_disk_dead);
|
||||
|
||||
@@ -641,17 +642,20 @@ void del_gendisk(struct gendisk *disk)
|
||||
disk_del_events(disk);
|
||||
|
||||
/*
|
||||
* Prevent new openers by unlinked the bdev inode, and write out
|
||||
* dirty data before marking the disk dead and stopping all I/O.
|
||||
* Prevent new openers by unlinked the bdev inode.
|
||||
*/
|
||||
mutex_lock(&disk->open_mutex);
|
||||
xa_for_each(&disk->part_tbl, idx, part) {
|
||||
xa_for_each(&disk->part_tbl, idx, part)
|
||||
remove_inode_hash(part->bd_inode);
|
||||
bdev_mark_dead(part, false);
|
||||
}
|
||||
mutex_unlock(&disk->open_mutex);
|
||||
|
||||
blk_mark_disk_dead(disk);
|
||||
/*
|
||||
* Tell the file system to write back all dirty data and shut down if
|
||||
* it hasn't been notified earlier.
|
||||
*/
|
||||
if (!test_bit(GD_DEAD, &disk->state))
|
||||
blk_report_disk_dead(disk, false);
|
||||
__blk_mark_disk_dead(disk);
|
||||
|
||||
/*
|
||||
* Drop all partitions now that the disk is marked dead.
|
||||
|
||||
Reference in New Issue
Block a user