Re: [PATCH 09/13] libxfs: remove ASSERT on ftype read from disk

Brian Foster
2015-03-19T16:46:48Z

On Tue, Mar 17, 2015 at 03:33:11PM -0500, Eric Sandeen wrote:
> 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>
> ---
> include/xfs_da_format.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/xfs_da_format.h b/include/xfs_da_format.h
> index 89a1a21..695e698 100644
> --- a/include/xfs_da_format.h
> +++ b/include/xfs_da_format.h
> @@ -561,7 +561,7 @@ 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);
> + //ASSERT(type < XFS_DIR3_FT_MAX);

Just delete it..?

Brian

> if (type < XFS_DIR3_FT_MAX)
> return type;
>
> --
> 1.7.1
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs