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

Commit a14a348b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: cleanup up xfs_log_force calling conventions 



Remove the XFS_LOG_FORCE argument which was always set, and the
XFS_LOG_URGE define, which was never used.

Split xfs_log_force into a two helpers - xfs_log_force which forces
the whole log, and xfs_log_force_lsn which forces up to the
specified LSN.  The underlying implementations already were entirely
separate, as were the users.

Also re-indent the new _xfs_log_force/_xfs_log_force which
previously had a weird coding style.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 4139b3b3

fs/xfs/linux-2.6/xfs_sync.c

+5 −12
Original line number Diff line number Diff line
@@ -296,10 +296,7 @@ xfs_sync_data( 
	if (error)

		return XFS_ERROR(error);



	xfs_log_force(mp, 0,

		      (flags & SYNC_WAIT) ?

		       XFS_LOG_FORCE | XFS_LOG_SYNC :

		       XFS_LOG_FORCE);

	xfs_log_force(mp, (flags & SYNC_WAIT) ? XFS_LOG_SYNC : 0);

	return 0;

}
@@ -325,10 +322,6 @@ xfs_commit_dummy_trans( 
	struct xfs_inode	*ip = mp->m_rootip;

	struct xfs_trans	*tp;

	int			error;

	int			log_flags = XFS_LOG_FORCE;



	if (flags & SYNC_WAIT)

		log_flags |= XFS_LOG_SYNC;



	/*

	 * Put a dummy transaction in the log to tell recovery
@@ -350,7 +343,7 @@ xfs_commit_dummy_trans( 
	xfs_iunlock(ip, XFS_ILOCK_EXCL);



	/* the log force ensures this transaction is pushed to disk */

	xfs_log_force(mp, 0, log_flags);

	xfs_log_force(mp, (flags & SYNC_WAIT) ? XFS_LOG_SYNC : 0);

	return error;

}
@@ -390,7 +383,7 @@ xfs_sync_fsdata( 
		 * become pinned in between there and here.

		 */

		if (XFS_BUF_ISPINNED(bp))

			xfs_log_force(mp, 0, XFS_LOG_FORCE);

			xfs_log_force(mp, 0);

	}
@@ -575,7 +568,7 @@ xfs_flush_inodes( 
	igrab(inode);

	xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_inodes_work, &completion);

	wait_for_completion(&completion);

	xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC);

	xfs_log_force(ip->i_mount, XFS_LOG_SYNC);

}



/*
@@ -591,7 +584,7 @@ xfs_sync_worker( 
	int		error;



	if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {

		xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);

		xfs_log_force(mp, 0);

		xfs_reclaim_inodes(mp, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

		/* dgc: errors ignored here */

		error = xfs_qm_sync(mp, SYNC_TRYLOCK);

fs/xfs/quota/xfs_dquot.c

+4 −6
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ xfs_qm_dqflush( 
	 */

	if (XFS_BUF_ISPINNED(bp)) {

		trace_xfs_dqflush_force(dqp);

		xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);

		xfs_log_force(mp, 0);

	}



	if (flags & XFS_QMOPT_DELWRI) {
@@ -1531,11 +1531,9 @@ xfs_qm_dqflock_pushbuf_wait( 
	if (bp != NULL) {

		if (XFS_BUF_ISDELAYWRITE(bp)) {

			int	error;

			if (XFS_BUF_ISPINNED(bp)) {

				xfs_log_force(dqp->q_mount,

					      (xfs_lsn_t)0,

					      XFS_LOG_FORCE);

			}



			if (XFS_BUF_ISPINNED(bp))

				xfs_log_force(dqp->q_mount, 0);

			error = xfs_bawrite(dqp->q_mount, bp);

			if (error)

				xfs_fs_cmn_err(CE_WARN, dqp->q_mount,

fs/xfs/quota/xfs_dquot_item.c

+4 −5
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ xfs_qm_dqunpin_wait( 
	/*

	 * Give the log a push so we don't wait here too long.

	 */

	xfs_log_force(dqp->q_mount, (xfs_lsn_t)0, XFS_LOG_FORCE);

	xfs_log_force(dqp->q_mount, 0);

	wait_event(dqp->q_pinwait, (atomic_read(&dqp->q_pincount) == 0));

}
@@ -245,10 +245,9 @@ xfs_qm_dquot_logitem_pushbuf( 
			qip->qli_pushbuf_flag = 0;

			xfs_dqunlock(dqp);



			if (XFS_BUF_ISPINNED(bp)) {

				xfs_log_force(mp, (xfs_lsn_t)0,

					      XFS_LOG_FORCE);

			}

			if (XFS_BUF_ISPINNED(bp))

				xfs_log_force(mp, 0);



			if (dopush) {

				int	error;

#ifdef XFSRACEDEBUG

fs/xfs/quota/xfs_qm_syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -1192,9 +1192,9 @@ xfs_qm_internalqcheck( 
	if (! XFS_IS_QUOTA_ON(mp))

		return XFS_ERROR(ESRCH);



	xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC);

	xfs_log_force(mp, XFS_LOG_SYNC);

	XFS_bflush(mp->m_ddev_targp);

	xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC);

	xfs_log_force(mp, XFS_LOG_SYNC);

	XFS_bflush(mp->m_ddev_targp);



	mutex_lock(&qcheck_lock);

fs/xfs/xfs_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -2601,5 +2601,5 @@ xfs_alloc_search_busy(xfs_trans_t *tp, 
	 * transaction that freed the block

	 */

	if (lsn)

		xfs_log_force(tp->t_mountp, lsn, XFS_LOG_FORCE|XFS_LOG_SYNC);

		xfs_log_force_lsn(tp->t_mountp, lsn, XFS_LOG_SYNC);

}