mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
[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>
This commit is contained in:
parent
4d1a2ed3d8
commit
421ad13458
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user