1 files changed, 76 insertions, 76 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 9c9a1c9bcc7f..b49ccf5c1d75 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1212,7 +1212,7 @@ xlog_iodone(xfs_buf_t *bp)
         }
 
         /* log I/O is always issued ASYNC */
-        ASSERT(XFS_BUF_ISASYNC(bp));
+        ASSERT(bp->b_flags & XBF_ASYNC);
         xlog_state_done_syncing(iclog, aborted);
 
         /*
@@ -1864,9 +1864,8 @@ xlog_sync(
 
         bp->b_io_length = BTOBB(count);
         bp->b_fspriv = iclog;
-        XFS_BUF_ZEROFLAGS(bp);
-        XFS_BUF_ASYNC(bp);
-        bp->b_flags |= XBF_SYNCIO;
+        bp->b_flags &= ~(XBF_FUA | XBF_FLUSH);
+        bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE);
 
         if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {
                 bp->b_flags |= XBF_FUA;
@@ -1893,12 +1892,11 @@ xlog_sync(
 
         /* account for log which doesn't start at block #0 */
         XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart);
+
         /*
          * Don't call xfs_bwrite here. We do log-syncs even when the filesystem
          * is shutting down.
          */
-        XFS_BUF_WRITE(bp);
-
         error = xlog_bdstrat(bp);
         if (error) {
                 xfs_buf_ioerror_alert(bp, "xlog_sync");
@@ -1910,9 +1908,8 @@ xlog_sync(
                 xfs_buf_associate_memory(bp,
                                 (char *)&iclog->ic_header + count, split);
                 bp->b_fspriv = iclog;
-                XFS_BUF_ZEROFLAGS(bp);
-                XFS_BUF_ASYNC(bp);
-                bp->b_flags |= XBF_SYNCIO;
+                bp->b_flags &= ~(XBF_FUA | XBF_FLUSH);
+                bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE);
                 if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
                         bp->b_flags |= XBF_FUA;
 
@@ -1921,7 +1918,6 @@ xlog_sync(
 
                 /* account for internal log which doesn't start at block #0 */
                 XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart);
-                XFS_BUF_WRITE(bp);
                 error = xlog_bdstrat(bp);
                 if (error) {
                         xfs_buf_ioerror_alert(bp, "xlog_sync (split)");
@@ -2012,77 +2008,81 @@ xlog_print_tic_res(
         uint ophdr_spc = ticket->t_res_num_ophdrs * (uint)sizeof(xlog_op_header_t);
 
         /* match with XLOG_REG_TYPE_* in xfs_log.h */
-        static char *res_type_str[XLOG_REG_TYPE_MAX] = {
-            "bformat",
-            "bchunk",
-            "efi_format",
-            "efd_format",
-            "iformat",
-            "icore",
-            "iext",
-            "ibroot",
-            "ilocal",
-            "iattr_ext",
-            "iattr_broot",
-            "iattr_local",
-            "qformat",
-            "dquot",
-            "quotaoff",
-            "LR header",
-            "unmount",
-            "commit",
-            "trans header"
+#define REG_TYPE_STR(type, str) [XLOG_REG_TYPE_##type] = str
+        static char *res_type_str[XLOG_REG_TYPE_MAX + 1] = {
+            REG_TYPE_STR(BFORMAT, "bformat"),
+            REG_TYPE_STR(BCHUNK, "bchunk"),
+            REG_TYPE_STR(EFI_FORMAT, "efi_format"),
+            REG_TYPE_STR(EFD_FORMAT, "efd_format"),
+            REG_TYPE_STR(IFORMAT, "iformat"),
+            REG_TYPE_STR(ICORE, "icore"),
+            REG_TYPE_STR(IEXT, "iext"),
+            REG_TYPE_STR(IBROOT, "ibroot"),
+            REG_TYPE_STR(ILOCAL, "ilocal"),
+            REG_TYPE_STR(IATTR_EXT, "iattr_ext"),
+            REG_TYPE_STR(IATTR_BROOT, "iattr_broot"),
+            REG_TYPE_STR(IATTR_LOCAL, "iattr_local"),
+            REG_TYPE_STR(QFORMAT, "qformat"),
+            REG_TYPE_STR(DQUOT, "dquot"),
+            REG_TYPE_STR(QUOTAOFF, "quotaoff"),
+            REG_TYPE_STR(LRHEADER, "LR header"),
+            REG_TYPE_STR(UNMOUNT, "unmount"),
+            REG_TYPE_STR(COMMIT, "commit"),
+            REG_TYPE_STR(TRANSHDR, "trans header"),
+            REG_TYPE_STR(ICREATE, "inode create")
         };
+#undef REG_TYPE_STR
+#define TRANS_TYPE_STR(type)    [XFS_TRANS_##type] = #type
         static char *trans_type_str[XFS_TRANS_TYPE_MAX] = {
-            "SETATTR_NOT_SIZE",
-            "SETATTR_SIZE",
-            "INACTIVE",
-            "CREATE",
-            "CREATE_TRUNC",
-            "TRUNCATE_FILE",
-            "REMOVE",
-            "LINK",
-            "RENAME",
-            "MKDIR",
-            "RMDIR",
-            "SYMLINK",
-            "SET_DMATTRS",
-            "GROWFS",
-            "STRAT_WRITE",
-            "DIOSTRAT",
-            "WRITE_SYNC",
-            "WRITEID",
-            "ADDAFORK",
-            "ATTRINVAL",
-            "ATRUNCATE",
-            "ATTR_SET",
-            "ATTR_RM",
-            "ATTR_FLAG",
-            "CLEAR_AGI_BUCKET",
-            "QM_SBCHANGE",
-            "DUMMY1",
-            "DUMMY2",
-            "QM_QUOTAOFF",
-            "QM_DQALLOC",
-            "QM_SETQLIM",
-            "QM_DQCLUSTER",
-            "QM_QINOCREATE",
-            "QM_QUOTAOFF_END",
-            "FSYNC_TS",
-            "GROWFSRT_ALLOC",
-            "GROWFSRT_ZERO",
-            "GROWFSRT_FREE",
-            "SWAPEXT",
-            "CHECKPOINT",
-            "ICREATE",
-            "CREATE_TMPFILE"
+            TRANS_TYPE_STR(SETATTR_NOT_SIZE),
+            TRANS_TYPE_STR(SETATTR_SIZE),
+            TRANS_TYPE_STR(INACTIVE),
+            TRANS_TYPE_STR(CREATE),
+            TRANS_TYPE_STR(CREATE_TRUNC),
+            TRANS_TYPE_STR(TRUNCATE_FILE),
+            TRANS_TYPE_STR(REMOVE),
+            TRANS_TYPE_STR(LINK),
+            TRANS_TYPE_STR(RENAME),
+            TRANS_TYPE_STR(MKDIR),
+            TRANS_TYPE_STR(RMDIR),
+            TRANS_TYPE_STR(SYMLINK),
+            TRANS_TYPE_STR(SET_DMATTRS),
+            TRANS_TYPE_STR(GROWFS),
+            TRANS_TYPE_STR(STRAT_WRITE),
+            TRANS_TYPE_STR(DIOSTRAT),
+            TRANS_TYPE_STR(WRITEID),
+            TRANS_TYPE_STR(ADDAFORK),
+            TRANS_TYPE_STR(ATTRINVAL),
+            TRANS_TYPE_STR(ATRUNCATE),
+            TRANS_TYPE_STR(ATTR_SET),
+            TRANS_TYPE_STR(ATTR_RM),
+            TRANS_TYPE_STR(ATTR_FLAG),
+            TRANS_TYPE_STR(CLEAR_AGI_BUCKET),
+            TRANS_TYPE_STR(SB_CHANGE),
+            TRANS_TYPE_STR(DUMMY1),
+            TRANS_TYPE_STR(DUMMY2),
+            TRANS_TYPE_STR(QM_QUOTAOFF),
+            TRANS_TYPE_STR(QM_DQALLOC),
+            TRANS_TYPE_STR(QM_SETQLIM),
+            TRANS_TYPE_STR(QM_DQCLUSTER),
+            TRANS_TYPE_STR(QM_QINOCREATE),
+            TRANS_TYPE_STR(QM_QUOTAOFF_END),
+            TRANS_TYPE_STR(FSYNC_TS),
+            TRANS_TYPE_STR(GROWFSRT_ALLOC),
+            TRANS_TYPE_STR(GROWFSRT_ZERO),
+            TRANS_TYPE_STR(GROWFSRT_FREE),
+            TRANS_TYPE_STR(SWAPEXT),
+            TRANS_TYPE_STR(CHECKPOINT),
+            TRANS_TYPE_STR(ICREATE),
+            TRANS_TYPE_STR(CREATE_TMPFILE)
         };
+#undef TRANS_TYPE_STR
 
         xfs_warn(mp, "xlog_write: reservation summary:");
         xfs_warn(mp, "  trans type  = %s (%u)",
                  ((ticket->t_trans_type <= 0 ||
                    ticket->t_trans_type > XFS_TRANS_TYPE_MAX) ?
-                  "bad-trans-type" : trans_type_str[ticket->t_trans_type-1]),
+                  "bad-trans-type" : trans_type_str[ticket->t_trans_type]),
                  ticket->t_trans_type);
         xfs_warn(mp, "  unit res    = %d bytes",
                  ticket->t_unit_res);
@@ -2101,7 +2101,7 @@ xlog_print_tic_res(
                 uint r_type = ticket->t_res_arr[i].r_type;
                 xfs_warn(mp, "region[%u]: %s - %u bytes", i,
                             ((r_type <= 0 || r_type > XLOG_REG_TYPE_MAX) ?
-                            "bad-rtype" : res_type_str[r_type-1]),
+                            "bad-rtype" : res_type_str[r_type]),
                             ticket->t_res_arr[i].r_len);
         }
 
@@ -3979,7 +3979,7 @@ xfs_log_force_umount(
             log->l_flags & XLOG_ACTIVE_RECOVERY) {
                 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
                 if (mp->m_sb_bp)
-                        XFS_BUF_DONE(mp->m_sb_bp);
+                        mp->m_sb_bp->b_flags |= XBF_DONE;
                 return 0;
         }
 
@@ -4009,7 +4009,7 @@ xfs_log_force_umount(
         spin_lock(&log->l_icloglock);
         mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
         if (mp->m_sb_bp)
-                XFS_BUF_DONE(mp->m_sb_bp);
+                mp->m_sb_bp->b_flags |= XBF_DONE;
 
         /*
          * Mark the log and the iclogs with IO error flags to prevent any