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

Commit 1c72bf90 authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files

[XFS] The last argument "lsn" of xfs_trans_commit() is always called with 


NULL.

Patch provided by Eric Sandeen.

SGI-PV: 961693
SGI-Modid: xfs-linux-melb:xfs-kern:28199a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 5b94f675

fs/xfs/quota/xfs_dquot.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -753,8 +753,7 @@ xfs_qm_idtodq( 
		goto error0;

		goto error0;

	}

	}

	if (tp) {

	if (tp) {

		if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES,

		if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES)))

					     NULL)))

			goto error1;

			goto error1;

	}

	}

fs/xfs/quota/xfs_qm.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1453,8 +1453,7 @@ xfs_qm_qino_alloc( 
	XFS_SB_UNLOCK(mp, s);

	XFS_SB_UNLOCK(mp, s);

	xfs_mod_sb(tp, sbfields);

	xfs_mod_sb(tp, sbfields);





	if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES,

	if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES))) {

				     NULL))) {

		xfs_fs_cmn_err(CE_ALERT, mp, "XFS qino_alloc failed!");

		xfs_fs_cmn_err(CE_ALERT, mp, "XFS qino_alloc failed!");

		return error;

		return error;

	}

	}
@@ -2405,7 +2404,7 @@ xfs_qm_write_sb_changes( 
	}

	}





	xfs_mod_sb(tp, flags);

	xfs_mod_sb(tp, flags);

	(void) xfs_trans_commit(tp, 0, NULL);

	(void) xfs_trans_commit(tp, 0);





	return 0;

	return 0;

}

}

fs/xfs/quota/xfs_qm_syscalls.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -735,7 +735,7 @@ xfs_qm_scall_setqlim( 
	xfs_trans_log_dquot(tp, dqp);

	xfs_trans_log_dquot(tp, dqp);





	xfs_dqtrace_entry(dqp, "Q_SETQLIM: COMMIT");

	xfs_dqtrace_entry(dqp, "Q_SETQLIM: COMMIT");

	xfs_trans_commit(tp, 0, NULL);

	xfs_trans_commit(tp, 0);

	xfs_qm_dqprint(dqp);

	xfs_qm_dqprint(dqp);

	xfs_qm_dqrele(dqp);

	xfs_qm_dqrele(dqp);

	mutex_unlock(&(XFS_QI_QOFFLOCK(mp)));

	mutex_unlock(&(XFS_QI_QOFFLOCK(mp)));
@@ -809,7 +809,7 @@ xfs_qm_log_quotaoff_end( 
	 * We don't care about quotoff's performance.

	 * We don't care about quotoff's performance.

	 */

	 */

	xfs_trans_set_sync(tp);

	xfs_trans_set_sync(tp);

	error = xfs_trans_commit(tp, 0, NULL);

	error = xfs_trans_commit(tp, 0);

	return (error);

	return (error);

}

}
@@ -852,7 +852,7 @@ xfs_qm_log_quotaoff( 
	 * We don't care about quotoff's performance.

	 * We don't care about quotoff's performance.

	 */

	 */

	xfs_trans_set_sync(tp);

	xfs_trans_set_sync(tp);

	error = xfs_trans_commit(tp, 0, NULL);

	error = xfs_trans_commit(tp, 0);





error0:

error0:

	if (error) {

	if (error) {

fs/xfs/xfs_attr.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -328,8 +328,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen, 
				xfs_trans_set_sync(args.trans);

				xfs_trans_set_sync(args.trans);

			}

			}

			err2 = xfs_trans_commit(args.trans,

			err2 = xfs_trans_commit(args.trans,

						 XFS_TRANS_RELEASE_LOG_RES,

						 XFS_TRANS_RELEASE_LOG_RES);

						 NULL);

			xfs_iunlock(dp, XFS_ILOCK_EXCL);

			xfs_iunlock(dp, XFS_ILOCK_EXCL);





			/*

			/*
@@ -397,8 +396,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen, 
	 * Commit the last in the sequence of transactions.

	 * Commit the last in the sequence of transactions.

	 */

	 */

	xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);

	xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);

	error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES,

	error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES);

				 NULL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);





	/*

	/*
@@ -544,8 +542,7 @@ xfs_attr_remove_int(xfs_inode_t *dp, const char *name, int namelen, int flags) 
	 * Commit the last in the sequence of transactions.

	 * Commit the last in the sequence of transactions.

	 */

	 */

	xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);

	xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);

	error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES,

	error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES);

				 NULL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);





	/*

	/*
@@ -859,8 +856,7 @@ xfs_attr_inactive(xfs_inode_t *dp) 
	 * Commit the last in the sequence of transactions.

	 * Commit the last in the sequence of transactions.

	 */

	 */

	xfs_trans_log_inode(trans, dp, XFS_ILOG_CORE);

	xfs_trans_log_inode(trans, dp, XFS_ILOG_CORE);

	error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES,

	error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES);

				 NULL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);

	xfs_iunlock(dp, XFS_ILOCK_EXCL);





	return(error);

	return(error);

fs/xfs/xfs_attr_leaf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3053,7 +3053,7 @@ xfs_attr_rolltrans(xfs_trans_t **transp, xfs_inode_t *dp) 
	 * is in progress. The caller takes the responsibility to cancel

	 * is in progress. The caller takes the responsibility to cancel

	 * the duplicate transaction that gets returned.

	 * the duplicate transaction that gets returned.

	 */

	 */

	if ((error = xfs_trans_commit(trans, 0, NULL)))

	if ((error = xfs_trans_commit(trans, 0)))

		return (error);

		return (error);





	trans = *transp;

	trans = *transp;