Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dave Chinner and committed by
Ben Myers
cab09a81 946217ba

+2 -3
+1 -1
fs/xfs/xfs_da_btree.c
··· 310 310 int type; 311 311 312 312 switch (be16_to_cpu(info->magic)) { 313 - case XFS_DA3_NODE_MAGIC: 314 313 case XFS_DA_NODE_MAGIC: 314 + case XFS_DA3_NODE_MAGIC: 315 315 type = XFS_BLFT_DA_NODE_BUF; 316 316 break; 317 317 case XFS_ATTR_LEAF_MAGIC:
+1 -2
fs/xfs/xfs_log_recover.c
··· 2039 2039 case XFS_BLFT_ATTR_RMT_BUF: 2040 2040 if (!xfs_sb_version_hascrc(&mp->m_sb)) 2041 2041 break; 2042 - if (magicda != XFS_ATTR3_RMT_MAGIC) { 2042 + if (magic32 != XFS_ATTR3_RMT_MAGIC) { 2043 2043 xfs_warn(mp, "Bad attr remote magic!"); 2044 2044 ASSERT(0); 2045 2045 break; ··· 2135 2135 ASSERT(i == item->ri_total); 2136 2136 2137 2137 xlog_recovery_validate_buf_type(mp, bp, buf_f); 2138 - 2139 2138 } 2140 2139 2141 2140 /*