aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2014-09-23 02:05:32 -0400
committerDave Chinner <david@fromorbit.com>2014-09-23 02:05:32 -0400
commitfb040131561a6b34cefb92cdf598218104abeda0 (patch)
treec5fae1013adc56bb89a1443313e246882d0dfab7
parent8af3dcd3c89aef10375bdd79d5f336b22b57487c (diff)
xfs: don't ASSERT on corrupt ftype
xfs_dir3_data_get_ftype() gets the file type off disk, but ASSERTs if it's invalid: ASSERT(type < XFS_DIR3_FT_MAX); We shouldn't ASSERT on bad values read from disk. V3 dirs are CRC-protected, but V2 dirs + ftype are not. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/xfs/libxfs/xfs_da_format.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
index c9aee52a37e2..7e42fdfd2f1d 100644
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -270,7 +270,6 @@ xfs_dir3_data_get_ftype(
270{ 270{
271 __uint8_t ftype = dep->name[dep->namelen]; 271 __uint8_t ftype = dep->name[dep->namelen];
272 272
273 ASSERT(ftype < XFS_DIR3_FT_MAX);
274 if (ftype >= XFS_DIR3_FT_MAX) 273 if (ftype >= XFS_DIR3_FT_MAX)
275 return XFS_DIR3_FT_UNKNOWN; 274 return XFS_DIR3_FT_UNKNOWN;
276 return ftype; 275 return ftype;