xfs
[Top] [All Lists]

[PATCH 4/4] xfs: fix da node magic number mismatches

To: xfs@xxxxxxxxxxx
Subject: [PATCH 4/4] xfs: fix da node magic number mismatches
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Tue, 30 Apr 2013 21:39:36 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1367321976-18268-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1367321976-18268-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 fs/xfs/xfs_da_btree.c    |    2 +-
 fs/xfs/xfs_log_recover.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 56814e3..9b26a99 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 ecaa4d4..93f03ec 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);
-
 }
 
 /*
-- 
1.7.10.4

<Prev in Thread] Current Thread [Next in Thread>