diff options
| author | Alex Elder <aelder@sgi.com> | 2011-07-11 09:51:44 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-07-11 10:21:03 -0500 |
| commit | b2ce39740066604288876c752d8170b3b17a21aa (patch) | |
| tree | fd51670cea52d4c4421ce98a65e8b4979535fb97 /fs/xfs/xfs_iomap.c | |
| parent | 81463b1ca8dbd2f4f180feac3f49c7640e2b5f79 (diff) | |
| download | talos-op-linux-b2ce39740066604288876c752d8170b3b17a21aa.tar.gz talos-op-linux-b2ce39740066604288876c752d8170b3b17a21aa.zip | |
Revert "xfs: fix filesystsem freeze race in xfs_trans_alloc"
This reverts commit 7a249cf83da1813cfa71cfe1e265b40045eceb47.
That commit created a situation that could lead to a filesystem
hang. As Dave Chinner pointed out, xfs_trans_alloc() could hold a
reference to m_active_trans (i.e., keep it non-zero) and then wait
for SB_FREEZE_TRANS to complete. Meanwhile a filesystem freeze
request could set SB_FREEZE_TRANS and then wait for m_active_trans
to drop to zero. Nobody benefits from this sequence of events...
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 982b71108f33..091d82b94c4d 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -688,7 +688,8 @@ xfs_iomap_write_unwritten( * the same inode that we complete here and might deadlock * on the iolock. */ - tp = _xfs_trans_alloc(mp, XFS_TRANS_STRAT_WRITE, KM_NOFS, true); + xfs_wait_for_freeze(mp, SB_FREEZE_TRANS); + tp = _xfs_trans_alloc(mp, XFS_TRANS_STRAT_WRITE, KM_NOFS); tp->t_flags |= XFS_TRANS_RESERVE; error = xfs_trans_reserve(tp, resblks, XFS_WRITE_LOG_RES(mp), 0, |
