Skip to content

Commit

Permalink
[XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/…
Browse files Browse the repository at this point in the history
…thaw

test hang.

SGI-PV: 953563
SGI-Modid: xfs-linux-melb:xfs-kern:26182a

Signed-off-by: Nathan Scott <nathans@sgi.com>
  • Loading branch information
Nathan Scott committed Jun 9, 2006
1 parent 4d1a2ed commit 421ad13
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/xfs/xfs_fsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 421ad13

Please sign in to comment.