diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:12:46 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 17:12:46 +1000 |
| commit | 421ad134583bff86c0ae068e2ddcb17f530957ab (patch) | |
| tree | cf910641c032ca5381a8bd30c0f56dfca9dcaa97 /fs | |
| parent | 4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b (diff) | |
| download | kernel_samsung_smdk4412-421ad134583bff86c0ae068e2ddcb17f530957ab.tar.gz kernel_samsung_smdk4412-421ad134583bff86c0ae068e2ddcb17f530957ab.tar.bz2 kernel_samsung_smdk4412-421ad134583bff86c0ae068e2ddcb17f530957ab.zip | |
[XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw
test hang.
SGI-PV: 953563
SGI-Modid: xfs-linux-melb:xfs-kern:26182a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 502483c41f9..650d35f537b 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -542,14 +542,13 @@ xfs_reserve_blocks( } void -xfs_fs_log_dummy(xfs_mount_t *mp) +xfs_fs_log_dummy( + xfs_mount_t *mp) { - xfs_trans_t *tp; - xfs_inode_t *ip; - + xfs_trans_t *tp; + xfs_inode_t *ip; tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1); - atomic_inc(&mp->m_active_trans); if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) { xfs_trans_cancel(tp, 0); return; |