Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cab09a81 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: fix da node magic number mismatches 



Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 946217ba

fs/xfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

fs/xfs/xfs_log_recover.c

+1 −2
Original line number Diff line number Diff line
@@ -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);



}



/*