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

Commit d88cc6f3 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: strengthen rmap record flags checking 



[ Upstream commit 498fe261f0d6d5189f8e11d283705dd97b474b54 ]

We always know the correct state of the rmap record flags (attr, bmbt,
unwritten) so check them by direct comparison.

Fixes: d852657c ("xfs: cross-reference reverse-mapping btree")
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 804b269c

fs/xfs/scrub/bmap.c

+4 −4
Original line number Diff line number Diff line
@@ -225,13 +225,13 @@ xchk_bmap_xref_rmap( 
	 * which doesn't track unwritten state.

	 */

	if (owner != XFS_RMAP_OWN_COW &&

	    irec->br_state == XFS_EXT_UNWRITTEN &&

	    !(rmap.rm_flags & XFS_RMAP_UNWRITTEN))

	    !!(irec->br_state == XFS_EXT_UNWRITTEN) !=

	    !!(rmap.rm_flags & XFS_RMAP_UNWRITTEN))

		xchk_fblock_xref_set_corrupt(info->sc, info->whichfork,

				irec->br_startoff);



	if (info->whichfork == XFS_ATTR_FORK &&

	    !(rmap.rm_flags & XFS_RMAP_ATTR_FORK))

	if (!!(info->whichfork == XFS_ATTR_FORK) !=

	    !!(rmap.rm_flags & XFS_RMAP_ATTR_FORK))

		xchk_fblock_xref_set_corrupt(info->sc, info->whichfork,

				irec->br_startoff);

	if (rmap.rm_flags & XFS_RMAP_BMBT_BLOCK)