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>

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 56814e305dea5145e23f4f5c86c6d6b32462e20b..9b26a99ebfe917ed67123a77794751fc2b72cecd 100644 (file)
--- 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 ecaa4d4ef39f0c8c0cd77566c1cdc7fe9fd86f1d..93f03ec17eeca5052a99a713895a1771887e55ac 100644 (file)
--- 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);
-
 }
 
 /*