From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 3/7] xfs: factor debug code out of xlog_state_do_callback()
Date: Wed, 4 Sep 2019 14:24:47 +1000 [thread overview]
Message-ID: <20190904042451.9314-4-david@fromorbit.com> (raw)
In-Reply-To: <20190904042451.9314-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Start making this function readable by lifting the debug code into
a conditional function.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_log.c | 83 ++++++++++++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 35 deletions(-)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 6f494f6369e8..b3d8dbb3b956 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2612,6 +2612,53 @@ xlog_get_lowest_lsn(
return lowest_lsn;
}
+#ifdef DEBUG
+/*
+ * Make one last gasp attempt to see if iclogs are being left in limbo. If the
+ * above loop finds an iclog earlier than the current iclog and in one of the
+ * syncing states, the current iclog is put into DO_CALLBACK and the callbacks
+ * are deferred to the completion of the earlier iclog. Walk the iclogs in order
+ * and make sure that no iclog is in DO_CALLBACK unless an earlier iclog is in
+ * one of the syncing states.
+ *
+ * Note that SYNCING|IOABORT is a valid state so we cannot just check for
+ * ic_state == SYNCING.
+ */
+static void
+xlog_state_callback_check_state(
+ struct xlog *log,
+ int did_callbacks)
+{
+ struct xlog_in_core *iclog;
+ struct xlog_in_core *first_iclog;
+
+ if (!did_callbacks)
+ return;
+
+ first_iclog = iclog = log->l_iclog;
+ do {
+ ASSERT(iclog->ic_state != XLOG_STATE_DO_CALLBACK);
+ /*
+ * Terminate the loop if iclogs are found in states
+ * which will cause other threads to clean up iclogs.
+ *
+ * SYNCING - i/o completion will go through logs
+ * DONE_SYNC - interrupt thread should be waiting for
+ * l_icloglock
+ * IOERROR - give up hope all ye who enter here
+ */
+ if (iclog->ic_state == XLOG_STATE_WANT_SYNC ||
+ iclog->ic_state & XLOG_STATE_SYNCING ||
+ iclog->ic_state == XLOG_STATE_DONE_SYNC ||
+ iclog->ic_state == XLOG_STATE_IOERROR )
+ break;
+ iclog = iclog->ic_next;
+ } while (first_iclog != iclog);
+}
+#else
+#define xlog_state_callback_check_state(l,d) ((void)0)
+#endif
+
STATIC void
xlog_state_do_callback(
struct xlog *log,
@@ -2786,41 +2833,7 @@ xlog_state_do_callback(
}
} while (!ioerrors && loopdidcallbacks);
-#ifdef DEBUG
- /*
- * Make one last gasp attempt to see if iclogs are being left in limbo.
- * If the above loop finds an iclog earlier than the current iclog and
- * in one of the syncing states, the current iclog is put into
- * DO_CALLBACK and the callbacks are deferred to the completion of the
- * earlier iclog. Walk the iclogs in order and make sure that no iclog
- * is in DO_CALLBACK unless an earlier iclog is in one of the syncing
- * states.
- *
- * Note that SYNCING|IOABORT is a valid state so we cannot just check
- * for ic_state == SYNCING.
- */
- if (funcdidcallbacks) {
- first_iclog = iclog = log->l_iclog;
- do {
- ASSERT(iclog->ic_state != XLOG_STATE_DO_CALLBACK);
- /*
- * Terminate the loop if iclogs are found in states
- * which will cause other threads to clean up iclogs.
- *
- * SYNCING - i/o completion will go through logs
- * DONE_SYNC - interrupt thread should be waiting for
- * l_icloglock
- * IOERROR - give up hope all ye who enter here
- */
- if (iclog->ic_state == XLOG_STATE_WANT_SYNC ||
- iclog->ic_state & XLOG_STATE_SYNCING ||
- iclog->ic_state == XLOG_STATE_DONE_SYNC ||
- iclog->ic_state == XLOG_STATE_IOERROR )
- break;
- iclog = iclog->ic_next;
- } while (first_iclog != iclog);
- }
-#endif
+ xlog_state_callback_check_state(log, funcdidcallbacks);
if (log->l_iclog->ic_state & (XLOG_STATE_ACTIVE|XLOG_STATE_IOERROR))
wake_up_all(&log->l_flush_wait);
--
2.23.0.rc1
next prev parent reply other threads:[~2019-09-04 4:24 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 4:24 [PATCH 0/7] xfs: log race fixes and cleanups Dave Chinner
2019-09-04 4:24 ` [PATCH 1/7] xfs: push the AIL in xlog_grant_head_wake Dave Chinner
2019-09-04 6:07 ` Christoph Hellwig
2019-09-04 21:46 ` Dave Chinner
2019-09-04 4:24 ` [PATCH 2/7] xfs: fix missed wakeup on l_flush_wait Dave Chinner
2019-09-04 6:07 ` Christoph Hellwig
2019-09-04 21:47 ` Dave Chinner
2019-09-04 4:24 ` Dave Chinner [this message]
2019-09-04 6:10 ` [PATCH 3/7] xfs: factor debug code out of xlog_state_do_callback() Christoph Hellwig
2019-09-04 21:14 ` Dave Chinner
2019-09-04 4:24 ` [PATCH 4/7] xfs: factor callbacks " Dave Chinner
2019-09-04 6:13 ` Christoph Hellwig
2019-09-04 6:32 ` Christoph Hellwig
2019-09-04 21:22 ` Dave Chinner
2019-09-04 4:24 ` [PATCH 5/7] xfs: factor iclog state processing " Dave Chinner
2019-09-04 6:42 ` Christoph Hellwig
2019-09-04 21:43 ` Dave Chinner
2019-09-04 4:24 ` [PATCH 6/7] xfs: push iclog state cleaning into xlog_state_clean_log Dave Chinner
2019-09-04 6:44 ` Christoph Hellwig
2019-09-04 4:24 ` [PATCH 7/7] xfs: push the grant head when the log head moves forward Dave Chinner
2019-09-04 6:45 ` Christoph Hellwig
2019-09-04 21:49 ` Dave Chinner
2019-09-04 19:34 ` Brian Foster
2019-09-04 22:50 ` Dave Chinner
2019-09-05 16:25 ` Brian Foster
2019-09-06 0:02 ` Dave Chinner
2019-09-06 13:10 ` Brian Foster
2019-09-07 15:10 ` Brian Foster
2019-09-08 23:26 ` Dave Chinner
2019-09-10 9:56 ` Brian Foster
2019-09-10 23:38 ` Dave Chinner
2019-09-12 13:46 ` Brian Foster
2019-09-17 4:31 ` Darrick J. Wong
2019-09-17 12:48 ` Brian Foster
2019-09-24 17:16 ` Darrick J. Wong
2019-09-26 13:19 ` Brian Foster
2019-09-04 5:26 ` [PATCH 0/7] xfs: log race fixes and cleanups Christoph Hellwig
2019-09-04 5:56 ` Christoph Hellwig
2019-09-04 22:57 ` Dave Chinner
[not found] ` <20190905065133.GA21840@infradead.org>
2019-09-05 7:10 ` Dave Chinner
2019-09-05 7:28 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190904042451.9314-4-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).