xfs: push iclog state cleaning into xlog_state_clean_log (0383f543) · Commits · 戴 / test

fs/xfs/xfs_log.c

+33 −24

Original line number	Diff line number	Diff line
		@@ -2523,21 +2523,35 @@ next_lv:
		*****************************************************************************
		*/

		/* Clean iclogs starting from the head. This ordering must be
		* maintained, so an iclog doesn't become ACTIVE beyond one that
		* is SYNCING. This is also required to maintain the notion that we use
		* a ordered wait queue to hold off would be writers to the log when every
		* iclog is trying to sync to disk.
		/*
		* An iclog has just finished IO completion processing, so we need to update
		* the iclog state and propagate that up into the overall log state. Hence we
		* prepare the iclog for cleaning, and then clean all the pending dirty iclogs
		* starting from the head, and then wake up any threads that are waiting for the
		* iclog to be marked clean.
		*
		* The ordering of marking iclogs ACTIVE must be maintained, so an iclog
		* doesn't become ACTIVE beyond one that is SYNCING. This is also required to
		* maintain the notion that we use a ordered wait queue to hold off would be
		* writers to the log when every iclog is trying to sync to disk.
		*
		* Caller must hold the icloglock before calling us.
		*
		* State Change: DIRTY -> ACTIVE
		* State Change: !IOERROR -> DIRTY -> ACTIVE
		*/
		STATIC void
		xlog_state_clean_log(
		struct xlog *log)
		xlog_state_clean_iclog(
		struct xlog *log,
		struct xlog_in_core *dirty_iclog)
		{
		xlog_in_core_t *iclog;
		struct xlog_in_core *iclog;
		int changed = 0;

		/* Prepare the completed iclog. */
		if (!(dirty_iclog->ic_state & XLOG_STATE_IOERROR))
		dirty_iclog->ic_state = XLOG_STATE_DIRTY;

		/* Walk all the iclogs to update the ordered active state. */
		iclog = log->l_iclog;
		do {
		if (iclog->ic_state == XLOG_STATE_DIRTY) {
		@@ -2575,7 +2589,13 @@ xlog_state_clean_log(
		iclog = iclog->ic_next;
		} while (iclog != log->l_iclog);

		/* log is locked when we are called */

		/*
		* Wake up threads waiting in xfs_log_force() for the dirty iclog
		* to be cleaned.
		*/
		wake_up_all(&dirty_iclog->ic_force_wait);

		/*
		* Change state for the dummy log recording.
		* We usually go to NEED. But we go to NEED2 if the changed indicates
		@@ -2609,7 +2629,7 @@ xlog_state_clean_log(
		ASSERT(0);
		}
		}
		} /* xlog_state_clean_log */
		}

		STATIC xfs_lsn_t
		xlog_get_lowest_lsn(
		@@ -2840,18 +2860,7 @@ xlog_state_do_callback(
		cycled_icloglock = true;
		xlog_state_do_iclog_callbacks(log, iclog, aborted);

		if (!(iclog->ic_state & XLOG_STATE_IOERROR))
		iclog->ic_state = XLOG_STATE_DIRTY;

		/*
		* Transition from DIRTY to ACTIVE if applicable.
		* NOP if STATE_IOERROR.
		*/
		xlog_state_clean_log(log);

		/* wake up threads waiting in xfs_log_force() */
		wake_up_all(&iclog->ic_force_wait);

		xlog_state_clean_iclog(log, iclog);
		iclog = iclog->ic_next;
		} while (first_iclog != iclog);

Admin message