| Message ID | 20230505175132.2236632-10-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk | expand |
On Fri, May 05, 2023 at 01:51:32PM -0400, Christoph Hellwig wrote: > Implement a set of holder_ops that shut down the file system when the > block device used as log or RT device is removed undeneath the file > system. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/xfs_super.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index 3abe5ae96cc59b..9c2401d9548d83 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -377,6 +377,17 @@ xfs_setup_dax_always( > return 0; > } > > +static void > +xfs_hop_mark_dead( > + struct block_device *bdev) > +{ > + xfs_force_shutdown(bdev->bd_holder, SHUTDOWN_DEVICE_REMOVED); /me wonders if this should be xfs_bdev_mark_dead, but eh that's mostly stylistic. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > +} > + > +static const struct blk_holder_ops xfs_holder_ops = { > + .mark_dead = xfs_hop_mark_dead, > +}; > + > STATIC int > xfs_blkdev_get( > xfs_mount_t *mp, > @@ -386,7 +397,7 @@ xfs_blkdev_get( > int error = 0; > > *bdevp = blkdev_get_by_path(name, FMODE_READ|FMODE_WRITE|FMODE_EXCL, > - mp, NULL); > + mp, &xfs_holder_ops); > if (IS_ERR(*bdevp)) { > error = PTR_ERR(*bdevp); > xfs_warn(mp, "Invalid device [%s], error=%d", name, error); > -- > 2.39.2 >
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 3abe5ae96cc59b..9c2401d9548d83 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -377,6 +377,17 @@ xfs_setup_dax_always( return 0; } +static void +xfs_hop_mark_dead( + struct block_device *bdev) +{ + xfs_force_shutdown(bdev->bd_holder, SHUTDOWN_DEVICE_REMOVED); +} + +static const struct blk_holder_ops xfs_holder_ops = { + .mark_dead = xfs_hop_mark_dead, +}; + STATIC int xfs_blkdev_get( xfs_mount_t *mp, @@ -386,7 +397,7 @@ xfs_blkdev_get( int error = 0; *bdevp = blkdev_get_by_path(name, FMODE_READ|FMODE_WRITE|FMODE_EXCL, - mp, NULL); + mp, &xfs_holder_ops); if (IS_ERR(*bdevp)) { error = PTR_ERR(*bdevp); xfs_warn(mp, "Invalid device [%s], error=%d", name, error);
Implement a set of holder_ops that shut down the file system when the block device used as log or RT device is removed undeneath the file system. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_super.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)