Merge branch 'xfs-misc-fixes-for-3.18-2' into for-next

This commit is contained in:
Dave Chinner
2014-09-23 22:55:51 +10:00
7 changed files with 71 additions and 14 deletions

View File

@@ -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;