Commit ac383de2 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: growfs not aware of sb_meta_uuid 



Adding this simple change to xfstests:common/rc::_scratch_mkfs_xfs:

+       if [ $mkfs_status -eq 0 ]; then
+               xfs_admin -U generate $SCRATCH_DEV > /dev/null
+       fi

triggers all sorts of errors in xfstests. xfs/104 is an example,
where growfs fails with a UUID mismatch corruption detected by
xfs_agf_write_verify() when trying to write the first new AG
headers.

Fix this problem by making sure we copy the sb_meta_uuid into new
metadata written by growfs.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent bbf155ad

fs/xfs/xfs_fsops.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -250,7 +250,7 @@ xfs_growfs_data_private( 
		agf->agf_freeblks = cpu_to_be32(tmpsize);

		agf->agf_freeblks = cpu_to_be32(tmpsize);

		agf->agf_longest = cpu_to_be32(tmpsize);

		agf->agf_longest = cpu_to_be32(tmpsize);

		if (xfs_sb_version_hascrc(&mp->m_sb))

		if (xfs_sb_version_hascrc(&mp->m_sb))

			uuid_copy(&agf->agf_uuid, &mp->m_sb.sb_uuid);

			uuid_copy(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid);





		error = xfs_bwrite(bp);

		error = xfs_bwrite(bp);

		xfs_buf_relse(bp);

		xfs_buf_relse(bp);
@@ -273,7 +273,7 @@ xfs_growfs_data_private( 
		if (xfs_sb_version_hascrc(&mp->m_sb)) {

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

			agfl->agfl_magicnum = cpu_to_be32(XFS_AGFL_MAGIC);

			agfl->agfl_magicnum = cpu_to_be32(XFS_AGFL_MAGIC);

			agfl->agfl_seqno = cpu_to_be32(agno);

			agfl->agfl_seqno = cpu_to_be32(agno);

			uuid_copy(&agfl->agfl_uuid, &mp->m_sb.sb_uuid);

			uuid_copy(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid);

		}

		}





		agfl_bno = XFS_BUF_TO_AGFL_BNO(mp, bp);

		agfl_bno = XFS_BUF_TO_AGFL_BNO(mp, bp);
@@ -309,7 +309,7 @@ xfs_growfs_data_private( 
		agi->agi_newino = cpu_to_be32(NULLAGINO);

		agi->agi_newino = cpu_to_be32(NULLAGINO);

		agi->agi_dirino = cpu_to_be32(NULLAGINO);

		agi->agi_dirino = cpu_to_be32(NULLAGINO);

		if (xfs_sb_version_hascrc(&mp->m_sb))

		if (xfs_sb_version_hascrc(&mp->m_sb))

			uuid_copy(&agi->agi_uuid, &mp->m_sb.sb_uuid);

			uuid_copy(&agi->agi_uuid, &mp->m_sb.sb_meta_uuid);

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

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

			agi->agi_free_root = cpu_to_be32(XFS_FIBT_BLOCK(mp));

			agi->agi_free_root = cpu_to_be32(XFS_FIBT_BLOCK(mp));

			agi->agi_free_level = cpu_to_be32(1);

			agi->agi_free_level = cpu_to_be32(1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE