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

Commit 85ae0109 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: don't assert when on-disk btree pointers are garbage 



Don't ASSERT when we encounter bad on-disk btree pointers in the debug
check functions.  Log the error to leave breadcrumbs and let the upper
layers deal with it.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent e63a1008

fs/xfs/libxfs/xfs_btree.c

+16 −7
Original line number Diff line number Diff line
@@ -246,16 +246,25 @@ xfs_btree_check_ptr( 
	int			level)

{

	if (cur->bc_flags & XFS_BTREE_LONG_PTRS) {

		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,

				xfs_btree_check_lptr(cur,

					be64_to_cpu((&ptr->l)[index]), level));

		if (xfs_btree_check_lptr(cur, be64_to_cpu((&ptr->l)[index]),

				level))

			return 0;

		xfs_err(cur->bc_mp,

"Inode %llu fork %d: Corrupt btree %d pointer at level %d index %d.",

				cur->bc_private.b.ip->i_ino,

				cur->bc_private.b.whichfork, cur->bc_btnum,

				level, index);

	} else {

		XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,

				xfs_btree_check_sptr(cur,

					be32_to_cpu((&ptr->s)[index]), level));

		if (xfs_btree_check_sptr(cur, be32_to_cpu((&ptr->s)[index]),

				level))

			return 0;

		xfs_err(cur->bc_mp,

"AG %u: Corrupt btree %d pointer at level %d index %d.",

				cur->bc_private.a.agno, cur->bc_btnum,

				level, index);

	}



	return 0;

	return -EFSCORRUPTED;

}



#ifdef DEBUG