From: Eric Sandeen <sandeen@sandeen.net>
Date: Tue, 7 Apr 2015 00:04:08 +0000 (+1000)
Subject: libxfs: remove ASSERT on ftype read from disk
X-Git-Tag: v3.2.3-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0402beabb94d4f25ee29f28f2b76898505a02eb6;p=thirdparty%2Fxfsprogs-dev.git

libxfs: remove ASSERT on ftype read from disk

This one is already fixed in the kernel, with
	fb04013 xfs: don't ASSERT on corrupt ftype
but that kernel<->userspace merge is still pending.

In the meantime, just fix it as a one-off here, because ASSERTing
on bad on-disk values when running xfs_repair is a very unfriendly
thing to do.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/include/xfs_da_format.h b/include/xfs_da_format.h
index 89a1a219c..11f142078 100644
--- a/include/xfs_da_format.h
+++ b/include/xfs_da_format.h
@@ -561,7 +561,6 @@ xfs_dir3_dirent_get_ftype(
 	if (xfs_sb_version_hasftype(&mp->m_sb)) {
 		__uint8_t	type = dep->name[dep->namelen];
 
-		ASSERT(type < XFS_DIR3_FT_MAX);
 		if (type < XFS_DIR3_FT_MAX)
 			return type;