xfs: convert XLOG_FORCED_SHUTDOWN() to xlog_is_shutdown()

Make it less shouty and a static inline before adding more calls
through the log code.

Also convert internal log code that uses XFS_FORCED_SHUTDOWN(mount)
to use xlog_is_shutdown(log) as well.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index cc2a0ccfcc30e4b03b201d9ed72219847402163e..e2dc8acf48bcf8237d7dc7b641551efa6b9141e9 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -246,7 +246,7 @@ xlog_grant_head_wait(
        list_add_tail(&tic->t_queue, &head->waiters);
 
        do {
-               if (XLOG_FORCED_SHUTDOWN(log))
+               if (xlog_is_shutdown(log))
                        goto shutdown;
                xlog_grant_push_ail(log, need_bytes);
 
@@ -260,7 +260,7 @@ xlog_grant_head_wait(
                trace_xfs_log_grant_wake(log, tic);
 
                spin_lock(&head->lock);
-               if (XLOG_FORCED_SHUTDOWN(log))
+               if (xlog_is_shutdown(log))
                        goto shutdown;
        } while (xlog_space_left(log, &head->grant) < need_bytes);
 
@@ -365,7 +365,7 @@ xfs_log_writable(
                return false;
        if (xfs_readonly_buftarg(mp->m_log->l_targ))
                return false;
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xlog_is_shutdown(mp->m_log))
                return false;
        return true;
 }
@@ -382,7 +382,7 @@ xfs_log_regrant(
        int                     need_bytes;
        int                     error = 0;
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return -EIO;
 
        XFS_STATS_INC(mp, xs_try_logspace);
@@ -450,7 +450,7 @@ xfs_log_reserve(
 
        ASSERT(client == XFS_TRANSACTION || client == XFS_LOG);
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return -EIO;
 
        XFS_STATS_INC(mp, xs_try_logspace);
@@ -830,7 +830,7 @@ xlog_wait_on_iclog(
        struct xlog             *log = iclog->ic_log;
 
        trace_xlog_iclog_wait_on(iclog, _RET_IP_);
-       if (!XLOG_FORCED_SHUTDOWN(log) &&
+       if (!xlog_is_shutdown(log) &&
            iclog->ic_state != XLOG_STATE_ACTIVE &&
            iclog->ic_state != XLOG_STATE_DIRTY) {
                XFS_STATS_INC(log->l_mp, xs_log_force_sleep);
@@ -839,7 +839,7 @@ xlog_wait_on_iclog(
                spin_unlock(&log->l_icloglock);
        }
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return -EIO;
        return 0;
 }
@@ -940,7 +940,7 @@ xfs_log_unmount_write(
 
        xfs_log_force(mp, XFS_LOG_SYNC);
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return;
 
        /*
@@ -1063,7 +1063,7 @@ xfs_log_space_wake(
        struct xlog             *log = mp->m_log;
        int                     free_bytes;
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return;
 
        if (!list_empty_careful(&log->l_write_head.waiters)) {
@@ -1154,7 +1154,7 @@ xfs_log_cover(
 
        ASSERT((xlog_cil_empty(mp->m_log) && xlog_iclogs_empty(mp->m_log) &&
                !xfs_ail_min_lsn(mp->m_log->l_ailp)) ||
-              XFS_FORCED_SHUTDOWN(mp));
+               xlog_is_shutdown(mp->m_log));
 
        if (!xfs_log_writable(mp))
                return 0;
@@ -1614,7 +1614,7 @@ xlog_commit_record(
        };
        int     error;
 
-       if (XLOG_FORCED_SHUTDOWN(log))
+       if (xlog_is_shutdown(log))
                return -EIO;
 
        error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS);
@@ -1695,7 +1695,7 @@ xlog_grant_push_ail(
        xfs_lsn_t       threshold_lsn;
 
        threshold_lsn = xlog_grant_push_threshold(log, need_bytes);
-       if (threshold_lsn == NULLCOMMITLSN || XLOG_FORCED_SHUTDOWN(log))
+       if (threshold_lsn == NULLCOMMITLSN || xlog_is_shutdown(log))
                return;
 
        /*
@@ -2886,7 +2886,7 @@ xlog_state_do_callback(
                        cycled_icloglock = true;
 
                        spin_lock(&log->l_icloglock);
-                       if (XLOG_FORCED_SHUTDOWN(log))
+                       if (xlog_is_shutdown(log))
                                wake_up_all(&iclog->ic_force_wait);
                        else
                                xlog_state_clean_iclog(log, iclog);
@@ -2938,7 +2938,7 @@ xlog_state_done_syncing(
         * split log writes, on the second, we shut down the file system and
         * no iclogs should ever be attempted to be written to disk again.
         */
-       if (!XLOG_FORCED_SHUTDOWN(log)) {
+       if (!xlog_is_shutdown(log)) {
                ASSERT(iclog->ic_state == XLOG_STATE_SYNCING);
                iclog->ic_state = XLOG_STATE_DONE_SYNC;
        }
@@ -2986,7 +2986,7 @@ xlog_state_get_iclog_space(
 
 restart:
        spin_lock(&log->l_icloglock);
-       if (XLOG_FORCED_SHUTDOWN(log)) {
+       if (xlog_is_shutdown(log)) {
                spin_unlock(&log->l_icloglock);
                return -EIO;
        }
@@ -3877,7 +3877,7 @@ xfs_log_force_umount(
         * No need to get locks for this.
         */
        if (logerror && log->l_iclog->ic_state == XLOG_STATE_IOERROR) {
-               ASSERT(XLOG_FORCED_SHUTDOWN(log));
+               ASSERT(xlog_is_shutdown(log));
                return 1;
        }
 

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 4e41130f206f05fa0ed1d1542a4978bda222444c..086e89334b5ed5ba5cb555017e564afd495c7e29 100644 (file)
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -584,7 +584,7 @@ xlog_cil_committed(
        struct xfs_cil_ctx      *ctx)
 {
        struct xfs_mount        *mp = ctx->cil->xc_log->l_mp;
-       bool                    abort = XLOG_FORCED_SHUTDOWN(ctx->cil->xc_log);
+       bool                    abort = xlog_is_shutdown(ctx->cil->xc_log);
 
        /*
         * If the I/O failed, we're aborting the commit and already shutdown.
@@ -862,7 +862,7 @@ restart:
                 * shutdown, but then went back to sleep once already in the
                 * shutdown state.
                 */
-               if (XLOG_FORCED_SHUTDOWN(log)) {
+               if (xlog_is_shutdown(log)) {
                        spin_unlock(&cil->xc_push_lock);
                        goto out_abort_free_ticket;
                }
@@ -971,7 +971,7 @@ out_skip:
 out_abort_free_ticket:
        xfs_log_ticket_ungrant(log, tic);
 out_abort:
-       ASSERT(XLOG_FORCED_SHUTDOWN(log));
+       ASSERT(xlog_is_shutdown(log));
        xlog_cil_committed(ctx);
 }
 
@@ -1124,7 +1124,7 @@ xlog_cil_commit(
 
        xlog_cil_insert_items(log, tp);
 
-       if (regrant && !XLOG_FORCED_SHUTDOWN(log))
+       if (regrant && !xlog_is_shutdown(log))
                xfs_log_ticket_regrant(log, tp->t_ticket);
        else
                xfs_log_ticket_ungrant(log, tp->t_ticket);
@@ -1197,7 +1197,7 @@ restart:
                 * shutdown, but then went back to sleep once already in the
                 * shutdown state.
                 */
-               if (XLOG_FORCED_SHUTDOWN(log))
+               if (xlog_is_shutdown(log))
                        goto out_shutdown;
                if (ctx->sequence > sequence)
                        continue;

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 6953f86f866cdd1d8e1a38ef9a8e7d80047c9617..e29fcb12dcb19baf37772c9fc5a114698223a1ca 100644 (file)
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -464,8 +464,11 @@ struct xlog {
 #define XLOG_BUF_CANCEL_BUCKET(log, blkno) \
        ((log)->l_buf_cancel_table + ((uint64_t)blkno % XLOG_BC_TABLE_SIZE))
 
-#define XLOG_FORCED_SHUTDOWN(log) \
-       (unlikely((log)->l_flags & XLOG_IO_ERROR))
+static inline bool
+xlog_is_shutdown(struct xlog *log)
+{
+       return (log->l_flags & XLOG_IO_ERROR);
+}
 
 /* common routines */
 extern int

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 1d4213302078797a1d111d842ec344b05c639369..e6589cf4d09fec3376e86d69f30060d346627999 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -146,7 +146,7 @@ xlog_do_io(
 
        error = xfs_rw_bdev(log->l_targ->bt_bdev, log->l_logBBstart + blk_no,
                        BBTOB(nbblks), data, op);
-       if (error && !XFS_FORCED_SHUTDOWN(log->l_mp)) {
+       if (error && !xlog_is_shutdown(log)) {
                xfs_alert(log->l_mp,
                          "log recovery %s I/O error at daddr 0x%llx len %d error %d",
                          op == REQ_OP_WRITE ? "write" : "read",
@@ -3313,10 +3313,7 @@ xlog_do_recover(
        if (error)
                return error;
 
-       /*
-        * If IO errors happened during recovery, bail out.
-        */
-       if (XFS_FORCED_SHUTDOWN(mp))
+       if (xlog_is_shutdown(log))
                return -EIO;
 
        /*
@@ -3338,7 +3335,7 @@ xlog_do_recover(
        xfs_buf_hold(bp);
        error = _xfs_buf_read(bp, XBF_READ);
        if (error) {
-               if (!XFS_FORCED_SHUTDOWN(mp)) {
+               if (!xlog_is_shutdown(log)) {
                        xfs_buf_ioerror_alert(bp, __this_address);
                        ASSERT(0);
                }

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 83abaa21961605064a9aa48e9fcf0d2781e9f286..b52394b0e1f44a4b79ef0b6383fd2165bb2433cf 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -905,7 +905,7 @@ out_unreserve:
         */
        xfs_trans_unreserve_and_mod_dquots(tp);
        if (tp->t_ticket) {
-               if (regrant && !XLOG_FORCED_SHUTDOWN(mp->m_log))
+               if (regrant && !xlog_is_shutdown(mp->m_log))
                        xfs_log_ticket_regrant(mp->m_log, tp->t_ticket);
                else
                        xfs_log_ticket_ungrant(mp->m_log, tp->t_ticket);