diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-05-21 17:08:14 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-08-10 09:58:01 -0700 |
| commit | 94c6e99854c5989fbc337b5729ac8a436bd8dda7 (patch) | |
| tree | 54c58c8214f556080684bb98330a18f88a6fc5ad /fs/xfs/xfs_super.c | |
| parent | 63208d2d364ca80c285fe1a107aab4276fa39a08 (diff) | |
xfs: create a polled function to force inode inactivationdeferred-inactivation_2019-08-10
Create a polled version of xfs_inactive_force so that we can force
inactivation while holding a lock (usually the umount lock) without
tripping over the softlockup timer. This is for callers that hold vfs
locks while calling inactivation, which is currently unmount, iunlink
processing during mount, and rw->ro remount.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
| -rw-r--r-- | fs/xfs/xfs_super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 915a7bfa3777..63d2b4056920 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1401,7 +1401,7 @@ xfs_fs_remount( * inodes. Since this can involve finobt updates, do it now * before we lose the per-AG space reservations. */ - xfs_inactive_force(mp); + xfs_inactive_force_poll(mp); /* Free the per-AG metadata reservation pool. */ error = xfs_fs_unreserve_ag_blocks(mp); @@ -1642,6 +1642,7 @@ xfs_mount_alloc( INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker); INIT_DELAYED_WORK(&mp->m_cowblocks_work, xfs_cowblocks_worker); mp->m_kobj.kobject.kset = xfs_kset; + init_waitqueue_head(&mp->m_inactive_wait); /* * We don't create the finobt per-ag space reservation until after log * recovery, so we must set this to true so that an ifree transaction |