From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 28 Jun 2018 20:11:57 +0000 (-0500)
Subject: xfs: don't assert when reporting on-disk corruption while loading btree
X-Git-Tag: v4.18.0-rc0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b49337e259a429a21ac9803b4936324f4cb4ed9;p=thirdparty%2Fxfsprogs-dev.git

xfs: don't assert when reporting on-disk corruption while loading btree

Source kernel commit: 17ba2cc7b5b9ee6a44baf5e169c8901f1f049ea8

Don't bother ASSERTing when we're already going to log and return the
corruption status.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index a81f6b40b..1e8039d20 100644
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -1239,7 +1239,6 @@ xfs_iread_extents(
 
 		num_recs = xfs_btree_get_numrecs(block);
 		if (unlikely(i + num_recs > nextents)) {
-			ASSERT(i + num_recs <= nextents);
 			xfs_warn(ip->i_mount,
 				"corrupt dinode %Lu, (btree extents).",
 				(unsigned long long) ip->i_ino);