]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: remove ASSERT on ftype read from disk
authorEric Sandeen <sandeen@sandeen.net>
Tue, 7 Apr 2015 00:04:08 +0000 (10:04 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 7 Apr 2015 00:04:08 +0000 (10:04 +1000)
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>
include/xfs_da_format.h

index 89a1a219c8ff57cc35a6e8c10f2309fff8ee183f..11f142078e12985622f66bfde1562be015531398 100644 (file)
@@ -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;