diff options
| author | Felix Blyakher <felixb@sgi.com> | 2005-11-25 16:42:13 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-11-25 16:42:13 +1100 |
| commit | 6b2cf618cc8445a03640d1e5e36829352e297017 (patch) | |
| tree | 160734b1718a0d7442132d6568263fa3a167cbe2 /fs | |
| parent | a4656391b76ed93faed724c5963f033164ee477e (diff) | |
| download | linux-3.10-6b2cf618cc8445a03640d1e5e36829352e297017.tar.gz linux-3.10-6b2cf618cc8445a03640d1e5e36829352e297017.tar.bz2 linux-3.10-6b2cf618cc8445a03640d1e5e36829352e297017.zip | |
[XFS] Tight loop in xfs_finish_reclaim_all prevented the xfslogd to run
its queue of IO completion callbacks, thus creating the deadlock between
umount and xfslogd. Breaking the loop solves the problem.
SGI-PV: 943821
SGI-Modid: xfs-linux-melb:xfs-kern:202363a
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 7c1f7453146..e03fa2a3d5e 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -3958,8 +3958,9 @@ xfs_finish_reclaim_all(xfs_mount_t *mp, int noblock) } } XFS_MOUNT_IUNLOCK(mp); - xfs_finish_reclaim(ip, noblock, - XFS_IFLUSH_DELWRI_ELSE_ASYNC); + if (xfs_finish_reclaim(ip, noblock, + XFS_IFLUSH_DELWRI_ELSE_ASYNC)) + delay(1); purged = 1; break; } |