]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: don't assert when reporting on-disk corruption while loading btree
authorDarrick J. Wong <darrick.wong@oracle.com>
Thu, 28 Jun 2018 20:11:57 +0000 (15:11 -0500)
committerEric Sandeen <sandeen@redhat.com>
Thu, 28 Jun 2018 20:11:57 +0000 (15:11 -0500)
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>
libxfs/xfs_bmap.c

index a81f6b40b54a7a4e44f25c7dcce6b1b5f469105d..1e8039d20c3b0e459965d09172fb988b510d6866 100644 (file)
@@ -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);