mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
xfs: xfs_syncd_stop must die
xfs_syncd_start and xfs_syncd_stop tie a bunch of unrelated functionailty together that actually have different start and stop requirements. Kill these functions and open code the start/stop methods for each of the background functions. Subsequent patches will move the start/stop functions around to the correct places to avoid races and shutdown issues. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
parent
ddffeb8c4d
commit
33c7a2bc48
3 changed files with 26 additions and 35 deletions
|
@ -1008,7 +1008,11 @@ xfs_fs_put_super(
|
||||||
xfs_filestream_unmount(mp);
|
xfs_filestream_unmount(mp);
|
||||||
cancel_delayed_work_sync(&mp->m_sync_work);
|
cancel_delayed_work_sync(&mp->m_sync_work);
|
||||||
xfs_unmountfs(mp);
|
xfs_unmountfs(mp);
|
||||||
xfs_syncd_stop(mp);
|
|
||||||
|
cancel_delayed_work_sync(&mp->m_sync_work);
|
||||||
|
cancel_delayed_work_sync(&mp->m_reclaim_work);
|
||||||
|
cancel_work_sync(&mp->m_flush_work);
|
||||||
|
|
||||||
xfs_freesb(mp);
|
xfs_freesb(mp);
|
||||||
xfs_icsb_destroy_counters(mp);
|
xfs_icsb_destroy_counters(mp);
|
||||||
xfs_destroy_mount_workqueues(mp);
|
xfs_destroy_mount_workqueues(mp);
|
||||||
|
@ -1384,9 +1388,11 @@ xfs_fs_fill_super(
|
||||||
sb->s_time_gran = 1;
|
sb->s_time_gran = 1;
|
||||||
set_posix_acl_flag(sb);
|
set_posix_acl_flag(sb);
|
||||||
|
|
||||||
error = xfs_syncd_init(mp);
|
INIT_WORK(&mp->m_flush_work, xfs_flush_worker);
|
||||||
if (error)
|
INIT_DELAYED_WORK(&mp->m_sync_work, xfs_sync_worker);
|
||||||
goto out_filestream_unmount;
|
INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
|
||||||
|
|
||||||
|
xfs_syncd_queue_sync(mp);
|
||||||
|
|
||||||
error = xfs_mountfs(mp);
|
error = xfs_mountfs(mp);
|
||||||
if (error)
|
if (error)
|
||||||
|
@ -1409,8 +1415,10 @@ xfs_fs_fill_super(
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
out_syncd_stop:
|
out_syncd_stop:
|
||||||
xfs_syncd_stop(mp);
|
cancel_delayed_work_sync(&mp->m_sync_work);
|
||||||
out_filestream_unmount:
|
cancel_delayed_work_sync(&mp->m_reclaim_work);
|
||||||
|
cancel_work_sync(&mp->m_flush_work);
|
||||||
|
|
||||||
xfs_filestream_unmount(mp);
|
xfs_filestream_unmount(mp);
|
||||||
out_free_sb:
|
out_free_sb:
|
||||||
xfs_freesb(mp);
|
xfs_freesb(mp);
|
||||||
|
@ -1429,7 +1437,10 @@ xfs_fs_fill_super(
|
||||||
out_unmount:
|
out_unmount:
|
||||||
xfs_filestream_unmount(mp);
|
xfs_filestream_unmount(mp);
|
||||||
xfs_unmountfs(mp);
|
xfs_unmountfs(mp);
|
||||||
xfs_syncd_stop(mp);
|
|
||||||
|
cancel_delayed_work_sync(&mp->m_sync_work);
|
||||||
|
cancel_delayed_work_sync(&mp->m_reclaim_work);
|
||||||
|
cancel_work_sync(&mp->m_flush_work);
|
||||||
goto out_free_sb;
|
goto out_free_sb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -370,7 +370,7 @@ xfs_quiesce_attr(
|
||||||
xfs_buf_unlock(mp->m_sb_bp);
|
xfs_buf_unlock(mp->m_sb_bp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
void
|
||||||
xfs_syncd_queue_sync(
|
xfs_syncd_queue_sync(
|
||||||
struct xfs_mount *mp)
|
struct xfs_mount *mp)
|
||||||
{
|
{
|
||||||
|
@ -383,7 +383,7 @@ xfs_syncd_queue_sync(
|
||||||
* disk quotas. We might need to cover the log to indicate that the
|
* disk quotas. We might need to cover the log to indicate that the
|
||||||
* filesystem is idle and not frozen.
|
* filesystem is idle and not frozen.
|
||||||
*/
|
*/
|
||||||
STATIC void
|
void
|
||||||
xfs_sync_worker(
|
xfs_sync_worker(
|
||||||
struct work_struct *work)
|
struct work_struct *work)
|
||||||
{
|
{
|
||||||
|
@ -445,7 +445,7 @@ xfs_syncd_queue_reclaim(
|
||||||
* goes low. It scans as quickly as possible avoiding locked inodes or those
|
* goes low. It scans as quickly as possible avoiding locked inodes or those
|
||||||
* already being flushed, and once done schedules a future pass.
|
* already being flushed, and once done schedules a future pass.
|
||||||
*/
|
*/
|
||||||
STATIC void
|
void
|
||||||
xfs_reclaim_worker(
|
xfs_reclaim_worker(
|
||||||
struct work_struct *work)
|
struct work_struct *work)
|
||||||
{
|
{
|
||||||
|
@ -478,7 +478,7 @@ xfs_flush_inodes(
|
||||||
flush_work(&mp->m_flush_work);
|
flush_work(&mp->m_flush_work);
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC void
|
void
|
||||||
xfs_flush_worker(
|
xfs_flush_worker(
|
||||||
struct work_struct *work)
|
struct work_struct *work)
|
||||||
{
|
{
|
||||||
|
@ -489,28 +489,6 @@ xfs_flush_worker(
|
||||||
xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_WAIT);
|
xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_WAIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
xfs_syncd_init(
|
|
||||||
struct xfs_mount *mp)
|
|
||||||
{
|
|
||||||
INIT_WORK(&mp->m_flush_work, xfs_flush_worker);
|
|
||||||
INIT_DELAYED_WORK(&mp->m_sync_work, xfs_sync_worker);
|
|
||||||
INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
|
|
||||||
|
|
||||||
xfs_syncd_queue_sync(mp);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
xfs_syncd_stop(
|
|
||||||
struct xfs_mount *mp)
|
|
||||||
{
|
|
||||||
cancel_delayed_work_sync(&mp->m_sync_work);
|
|
||||||
cancel_delayed_work_sync(&mp->m_reclaim_work);
|
|
||||||
cancel_work_sync(&mp->m_flush_work);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
__xfs_inode_set_reclaim_tag(
|
__xfs_inode_set_reclaim_tag(
|
||||||
struct xfs_perag *pag,
|
struct xfs_perag *pag,
|
||||||
|
|
|
@ -26,8 +26,10 @@ struct xfs_perag;
|
||||||
|
|
||||||
extern struct workqueue_struct *xfs_syncd_wq; /* sync workqueue */
|
extern struct workqueue_struct *xfs_syncd_wq; /* sync workqueue */
|
||||||
|
|
||||||
int xfs_syncd_init(struct xfs_mount *mp);
|
void xfs_syncd_queue_sync(struct xfs_mount *mp);
|
||||||
void xfs_syncd_stop(struct xfs_mount *mp);
|
void xfs_sync_worker(struct work_struct *work);
|
||||||
|
void xfs_flush_worker(struct work_struct *work);
|
||||||
|
void xfs_reclaim_worker(struct work_struct *work);
|
||||||
|
|
||||||
int xfs_quiesce_data(struct xfs_mount *mp);
|
int xfs_quiesce_data(struct xfs_mount *mp);
|
||||||
void xfs_quiesce_attr(struct xfs_mount *mp);
|
void xfs_quiesce_attr(struct xfs_mount *mp);
|
||||||
|
|
Loading…
Reference in a new issue