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

Commit 5461ad99 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-meta-uuid' into for-next

parents 20b83944 ce748eaa

fs/xfs/libxfs/xfs_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ xfs_agfl_verify( 
	struct xfs_agfl	*agfl = XFS_BUF_TO_AGFL(bp);

	int		i;



	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_uuid))

	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))

		return false;

	if (be32_to_cpu(agfl->agfl_magicnum) != XFS_AGFL_MAGIC)

		return false;
@@ -2260,7 +2260,7 @@ xfs_agf_verify( 
	struct xfs_agf	*agf = XFS_BUF_TO_AGF(bp);



	if (xfs_sb_version_hascrc(&mp->m_sb) &&

	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_uuid))

	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

			return false;



	if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&

fs/xfs/libxfs/xfs_alloc_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ xfs_allocbt_verify( 
	case cpu_to_be32(XFS_ABTB_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;
@@ -313,7 +313,7 @@ xfs_allocbt_verify( 
	case cpu_to_be32(XFS_ABTC_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ xfs_attr3_leaf_verify( 
		if (ichdr.magic != XFS_ATTR3_LEAF_MAGIC)

			return false;



		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)

			return false;
@@ -1056,7 +1056,7 @@ xfs_attr3_leaf_create( 


		hdr3->blkno = cpu_to_be64(bp->b_bn);

		hdr3->owner = cpu_to_be64(dp->i_ino);

		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_uuid);

		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_meta_uuid);



		ichdr.freemap[0].base = sizeof(struct xfs_attr3_leaf_hdr);

	} else {

fs/xfs/libxfs/xfs_attr_remote.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ xfs_attr3_rmt_verify( 
		return false;

	if (rmt->rm_magic != cpu_to_be32(XFS_ATTR3_RMT_MAGIC))

		return false;

	if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_uuid))

	if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid))

		return false;

	if (be64_to_cpu(rmt->rm_blkno) != bno)

		return false;
@@ -222,7 +222,7 @@ xfs_attr3_rmt_hdr_set( 
	rmt->rm_magic = cpu_to_be32(XFS_ATTR3_RMT_MAGIC);

	rmt->rm_offset = cpu_to_be32(offset);

	rmt->rm_bytes = cpu_to_be32(size);

	uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_uuid);

	uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid);

	rmt->rm_owner = cpu_to_be64(ino);

	rmt->rm_blkno = cpu_to_be64(bno);

fs/xfs/libxfs/xfs_bmap_btree.c

+3 −2
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ xfs_bmbt_to_bmdr( 


	if (xfs_sb_version_hascrc(&mp->m_sb)) {

		ASSERT(rblock->bb_magic == cpu_to_be32(XFS_BMAP_CRC_MAGIC));

		ASSERT(uuid_equal(&rblock->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid));

		ASSERT(uuid_equal(&rblock->bb_u.l.bb_uuid,

		       &mp->m_sb.sb_meta_uuid));

		ASSERT(rblock->bb_u.l.bb_blkno ==

		       cpu_to_be64(XFS_BUF_DADDR_NULL));

	} else
@@ -647,7 +648,7 @@ xfs_bmbt_verify( 
	case cpu_to_be32(XFS_BMAP_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (be64_to_cpu(block->bb_u.l.bb_blkno) != bp->b_bn)

			return false;