qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: close the external block devices in xfs_mount_free 

JIRA: https://issues.redhat.com/browse/RHEL-29262

commit 35a93b148b0363dca23c3db1cc9d48100eb8b276
Author: Christoph Hellwig <hch@lst.de>
Date:   Wed Aug 9 15:05:38 2023 -0700

    xfs: close the external block devices in xfs_mount_free

    blkdev_put must not be called under sb->s_umount to avoid a lock order
    reversal with disk->open_mutex.  Move closing the buftargs into ->kill_sb
    to archive that.  Note that the flushing of the disk caches and
    block device mapping invalidated needs to stay in ->put_super as the main
    block device is closed in kill_block_super already.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
    Message-Id: <20230809220545.1308228-7-hch@lst.de>
    Signed-off-by: Christian Brauner <brauner@kernel.org>

Signed-off-by: Ming Lei <ming.lei@redhat.com>
This commit is contained in:
Ming Lei 2023-08-09 15:05:38 -07:00
parent 47287f1914
commit f9ca79532a
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_buf.c
View File

@ -1946,8 +1946,6 @@ xfs_free_buftarg(
percpu_counter_destroy(&btp->bt_io_count); percpu_counter_destroy(&btp->bt_io_count);
list_lru_destroy(&btp->bt_lru); list_lru_destroy(&btp->bt_lru);
blkdev_issue_flush(btp->bt_bdev);
invalidate_bdev(btp->bt_bdev);
fs_put_dax(btp->bt_daxdev, btp->bt_mount); fs_put_dax(btp->bt_daxdev, btp->bt_mount);
/* the main block device is closed by kill_block_super */ /* the main block device is closed by kill_block_super */
if (bdev != btp->bt_mount->m_super->s_bdev) if (bdev != btp->bt_mount->m_super->s_bdev)

36
fs/xfs/xfs_super.c
View File

@ -385,22 +385,19 @@ xfs_blkdev_get(
} }
STATIC void STATIC void
xfs_close_devices( xfs_shutdown_devices(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) { if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) {
struct block_device *logdev = mp->m_logdev_targp->bt_bdev; blkdev_issue_flush(mp->m_logdev_targp->bt_bdev);
invalidate_bdev(mp->m_logdev_targp->bt_bdev);
xfs_free_buftarg(mp->m_logdev_targp);
blkdev_put(logdev, mp);
} }
if (mp->m_rtdev_targp) { if (mp->m_rtdev_targp) {
struct block_device *rtdev = mp->m_rtdev_targp->bt_bdev; blkdev_issue_flush(mp->m_rtdev_targp->bt_bdev);
invalidate_bdev(mp->m_rtdev_targp->bt_bdev);
xfs_free_buftarg(mp->m_rtdev_targp);
blkdev_put(rtdev, mp);
} }
xfs_free_buftarg(mp->m_ddev_targp); blkdev_issue_flush(mp->m_ddev_targp->bt_bdev);
invalidate_bdev(mp->m_ddev_targp->bt_bdev);
} }
/* /*
@ -728,6 +725,17 @@ static void
xfs_mount_free( xfs_mount_free(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
/*
* Free the buftargs here because blkdev_put needs to be called outside
* of sb->s_umount, which is held around the call to ->put_super.
*/
if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp)
xfs_free_buftarg(mp->m_logdev_targp);
if (mp->m_rtdev_targp)
xfs_free_buftarg(mp->m_rtdev_targp);
if (mp->m_ddev_targp)
xfs_free_buftarg(mp->m_ddev_targp);
kfree(mp->m_rtname); kfree(mp->m_rtname);
kfree(mp->m_logname); kfree(mp->m_logname);
kmem_free(mp); kmem_free(mp);
@ -1111,7 +1119,7 @@ xfs_fs_put_super(
xfs_inodegc_free_percpu(mp); xfs_inodegc_free_percpu(mp);
xfs_destroy_percpu_counters(mp); xfs_destroy_percpu_counters(mp);
xfs_destroy_mount_workqueues(mp); xfs_destroy_mount_workqueues(mp);
xfs_close_devices(mp); xfs_shutdown_devices(mp);
} }
static long static long
@ -1484,7 +1492,7 @@ xfs_fs_fill_super(
error = xfs_init_mount_workqueues(mp); error = xfs_init_mount_workqueues(mp);
if (error) if (error)
goto out_close_devices; goto out_shutdown_devices;
error = xfs_init_percpu_counters(mp); error = xfs_init_percpu_counters(mp);
if (error) if (error)
@ -1688,8 +1696,8 @@ xfs_fs_fill_super(
xfs_destroy_percpu_counters(mp); xfs_destroy_percpu_counters(mp);
out_destroy_workqueues: out_destroy_workqueues:
xfs_destroy_mount_workqueues(mp); xfs_destroy_mount_workqueues(mp);
out_close_devices: out_shutdown_devices:
xfs_close_devices(mp); xfs_shutdown_devices(mp);
return error; return error;
out_unmount: out_unmount: