xfs: fix da node magic number mismatches

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 56814e305dea..9b26a99ebfe9 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -310,8 +310,8 @@ xfs_da3_node_read(
                 int                     type;
 
                 switch (be16_to_cpu(info->magic)) {
-                case XFS_DA3_NODE_MAGIC:
                 case XFS_DA_NODE_MAGIC:
+                case XFS_DA3_NODE_MAGIC:
                         type = XFS_BLFT_DA_NODE_BUF;
                         break;
                 case XFS_ATTR_LEAF_MAGIC:
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index ecaa4d4ef39f..93f03ec17eec 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2039,7 +2039,7 @@ xlog_recovery_validate_buf_type(
         case XFS_BLFT_ATTR_RMT_BUF:
                 if (!xfs_sb_version_hascrc(&mp->m_sb))
                         break;
-                if (magicda != XFS_ATTR3_RMT_MAGIC) {
+                if (magic32 != XFS_ATTR3_RMT_MAGIC) {
                         xfs_warn(mp, "Bad attr remote magic!");
                         ASSERT(0);
                         break;
@@ -2135,7 +2135,6 @@ xlog_recover_do_reg_buffer(
         ASSERT(i == item->ri_total);
 
         xlog_recovery_validate_buf_type(mp, bp, buf_f);
-
 }
 
 /*