Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 07:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs use fs_holder_ops for the log and RT devices

Browse Source 
Use the generic fs_holder_ops to shut down the file system when the
log or RT device goes away instead of duplicating the logic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Message-Id: <20230802154131.2221419-13-hch@lst.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christoph Hellwig 2023-08-02 17:41:31 +02:00 committed by Christian Brauner
parent 8d945b595e
commit 8ffa54e337
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/xfs_super.c
View File

@ -377,17 +377,6 @@ disable_dax:
return 0;
}
static void
xfs_bdev_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_bdev_mark_dead,
};
STATIC int
xfs_blkdev_get(
xfs_mount_t *mp,
@ -396,8 +385,8 @@ xfs_blkdev_get(
{
int error = 0;
*bdevp = blkdev_get_by_path(name, BLK_OPEN_READ | BLK_OPEN_WRITE, mp,
&xfs_holder_ops);
*bdevp = blkdev_get_by_path(name, BLK_OPEN_READ | BLK_OPEN_WRITE,
mp->m_super, &fs_holder_ops);
if (IS_ERR(*bdevp)) {
error = PTR_ERR(*bdevp);
xfs_warn(mp, "Invalid device [%s], error=%d", name, error);
@ -529,10 +518,10 @@ out_relock:
xfs_free_buftarg(mp->m_ddev_targp);
out_close_rtdev:
if (rtdev)
blkdev_put(rtdev, mp);
blkdev_put(rtdev, sb);
out_close_logdev:
if (logdev && logdev != ddev)
blkdev_put(logdev, mp);
blkdev_put(logdev, sb);
goto out_relock;
}