Commit 9d392064 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: fold __xlog_state_release_iclog into xlog_state_release_iclog 



Fold __xlog_state_release_iclog into its only caller to prepare
make an upcoming fix easier.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
[hch: split from a larger patch]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent b5d721ea

fs/xfs/xfs_log.c

+17 −28
Original line number Diff line number Diff line
@@ -487,29 +487,6 @@ xfs_log_reserve( 
	return error;

}



static bool

__xlog_state_release_iclog(

	struct xlog		*log,

	struct xlog_in_core	*iclog)

{

	lockdep_assert_held(&log->l_icloglock);



	if (iclog->ic_state == XLOG_STATE_WANT_SYNC) {

		/* update tail before writing to iclog */

		xfs_lsn_t tail_lsn = xlog_assign_tail_lsn(log->l_mp);



		iclog->ic_state = XLOG_STATE_SYNCING;

		iclog->ic_header.h_tail_lsn = cpu_to_be64(tail_lsn);

		xlog_verify_tail_lsn(log, iclog, tail_lsn);

		/* cycle incremented when incrementing curr_block */

		trace_xlog_iclog_syncing(iclog, _RET_IP_);

		return true;

	}



	ASSERT(iclog->ic_state == XLOG_STATE_ACTIVE);

	return false;

}



/*

 * Flush iclog to disk if this is the last reference to the given iclog and the

 * it is in the WANT_SYNC state.
@@ -519,19 +496,31 @@ xlog_state_release_iclog( 
	struct xlog		*log,

	struct xlog_in_core	*iclog)

{

	xfs_lsn_t		tail_lsn;

	lockdep_assert_held(&log->l_icloglock);



	trace_xlog_iclog_release(iclog, _RET_IP_);

	if (iclog->ic_state == XLOG_STATE_IOERROR)

		return -EIO;



	if (atomic_dec_and_test(&iclog->ic_refcnt) &&

	    __xlog_state_release_iclog(log, iclog)) {

	if (!atomic_dec_and_test(&iclog->ic_refcnt))

		return 0;



	if (iclog->ic_state != XLOG_STATE_WANT_SYNC) {

		ASSERT(iclog->ic_state == XLOG_STATE_ACTIVE);

		return 0;

	}



	/* update tail before writing to iclog */

	tail_lsn = xlog_assign_tail_lsn(log->l_mp);

	iclog->ic_state = XLOG_STATE_SYNCING;

	iclog->ic_header.h_tail_lsn = cpu_to_be64(tail_lsn);

	xlog_verify_tail_lsn(log, iclog, tail_lsn);

	trace_xlog_iclog_syncing(iclog, _RET_IP_);



	spin_unlock(&log->l_icloglock);

	xlog_sync(log, iclog);

	spin_lock(&log->l_icloglock);

	}



	return 0;

}