From: Nathan Scott Date: Wed, 18 Dec 2002 06:31:29 +0000 (+0000) Subject: Sync up a couple of trivial kernel changes with libxfs. X-Git-Tag: v2.4.0~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a95cf25261e029b1960ec7b0ce65adec9000f6be;p=thirdparty%2Fxfsprogs-dev.git Sync up a couple of trivial kernel changes with libxfs. --- diff --git a/libxfs/xfs_dir.c b/libxfs/xfs_dir.c index b890a3f1e..052f1f0c1 100644 --- a/libxfs/xfs_dir.c +++ b/libxfs/xfs_dir.c @@ -218,9 +218,6 @@ xfs_dir_lookup(xfs_trans_t *trans, xfs_inode_t *dp, char *name, int namelen, int retval; ASSERT((dp->i_d.di_mode & IFMT) == IFDIR); - if (namelen >= MAXNAMELEN) { - return(XFS_ERROR(EINVAL)); - } XFS_STATS_INC(xfsstats.xs_dir_lookup); /* @@ -264,9 +261,6 @@ xfs_dir_replace(xfs_trans_t *trans, xfs_inode_t *dp, char *name, int namelen, int retval; ASSERT((dp->i_d.di_mode & IFMT) == IFDIR); - if (namelen >= MAXNAMELEN) { - return(XFS_ERROR(EINVAL)); - } if ((retval = xfs_dir_ino_validate(trans->t_mountp, inum))) return retval; diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c index b923b30da..a82f2cee4 100644 --- a/libxfs/xfs_dir2.c +++ b/libxfs/xfs_dir2.c @@ -156,10 +156,8 @@ xfs_dir2_lookup( int v; /* type-checking value */ ASSERT((dp->i_d.di_mode & IFMT) == IFDIR); - if (namelen >= MAXNAMELEN) { - return XFS_ERROR(EINVAL); - } XFS_STATS_INC(xfsstats.xs_dir_lookup); + /* * Fill in the arg structure for this request. */ @@ -268,9 +266,7 @@ xfs_dir2_replace( int v; /* type-checking value */ ASSERT((dp->i_d.di_mode & IFMT) == IFDIR); - if (namelen >= MAXNAMELEN) { - return XFS_ERROR(EINVAL); - } + if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum))) { return rval; }