diff options
author | Dave Chinner <david@fromorbit.com> | 2014-09-23 22:55:51 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-09-23 22:55:51 +1000 |
commit | 33044dc408e6e6bb7f270c0a2e12598ef5592987 (patch) | |
tree | 67dedd3461599e28a95e298db436bc3fc4139d4f /fs/xfs/libxfs/xfs_da_format.c | |
parent | f6d31f4b0462898896ba68e491662958ce37d095 (diff) | |
parent | 2ebff7bbd785c86e12956388b9e6f6bb8ea5d21e (diff) | |
download | linux-33044dc408e6e6bb7f270c0a2e12598ef5592987.tar.gz linux-33044dc408e6e6bb7f270c0a2e12598ef5592987.tar.bz2 linux-33044dc408e6e6bb7f270c0a2e12598ef5592987.zip |
Merge branch 'xfs-misc-fixes-for-3.18-2' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_da_format.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_da_format.c | 1 |
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( { __uint8_t ftype = dep->name[dep->namelen]; - ASSERT(ftype < XFS_DIR3_FT_MAX); if (ftype >= XFS_DIR3_FT_MAX) return XFS_DIR3_FT_UNKNOWN; return ftype; |