aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-09 03:12:46 -0400
committerNathan Scott <nathans@sgi.com>2006-06-09 03:12:46 -0400
commit421ad134583bff86c0ae068e2ddcb17f530957ab (patch)
treecf910641c032ca5381a8bd30c0f56dfca9dcaa97 /fs/xfs
parent4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b (diff)
[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/xfs')
-rw-r--r--fs/xfs/xfs_fsops.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 502483c41f97..650d35f537b7 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -542,14 +542,13 @@ xfs_reserve_blocks(
542} 542}
543 543
544void 544void
545xfs_fs_log_dummy(xfs_mount_t *mp) 545xfs_fs_log_dummy(
546 xfs_mount_t *mp)
546{ 547{
547 xfs_trans_t *tp; 548 xfs_trans_t *tp;
548 xfs_inode_t *ip; 549 xfs_inode_t *ip;
549
550 550
551 tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1); 551 tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);
552 atomic_inc(&mp->m_active_trans);
553 if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) { 552 if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {
554 xfs_trans_cancel(tp, 0); 553 xfs_trans_cancel(tp, 0);
555 return; 554 return;