Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421ad134 authored by Nathan Scott's avatar Nathan Scott
Browse files

[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: default avatarNathan Scott <nathans@sgi.com>
parent 4d1a2ed3

fs/xfs/xfs_fsops.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -542,14 +542,13 @@ xfs_reserve_blocks( 
}

}





void

void

xfs_fs_log_dummy(xfs_mount_t *mp)

xfs_fs_log_dummy(

	xfs_mount_t	*mp)

{

{

	xfs_trans_t	*tp;

	xfs_trans_t	*tp;

	xfs_inode_t	*ip;

	xfs_inode_t	*ip;







	tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);

	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)) {

	if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {

		xfs_trans_cancel(tp, 0);

		xfs_trans_cancel(tp, 0);

		return;

		return;