Commit 5d8943b0 authored by Al Viro's avatar Al Viro
Browse files

afs: get rid of redundant ->d_name.len checks 



No dentry can get to directory modification methods without
having passed either ->lookup() or ->atomic_open(); if name is
rejected by those two (or by ->d_hash()) with an error, it won't
be seen by anything else.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e7d33bb5

fs/afs/dir.c

+0 −24
Original line number Diff line number Diff line
@@ -751,10 +751,6 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
	_enter("{%x:%u},{%s},%ho",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	key = afs_request_key(dvnode->volume->cell);

	if (IS_ERR(key)) {

		ret = PTR_ERR(key);
@@ -816,10 +812,6 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry) 
	_enter("{%x:%u},{%s}",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	key = afs_request_key(dvnode->volume->cell);

	if (IS_ERR(key)) {

		ret = PTR_ERR(key);
@@ -936,10 +928,6 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	_enter("{%x:%u},{%s},%ho,",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	key = afs_request_key(dvnode->volume->cell);

	if (IS_ERR(key)) {

		ret = PTR_ERR(key);
@@ -1005,10 +993,6 @@ static int afs_link(struct dentry *from, struct inode *dir, 
	       dvnode->fid.vid, dvnode->fid.vnode,

	       dentry->d_name.name);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	key = afs_request_key(dvnode->volume->cell);

	if (IS_ERR(key)) {

		ret = PTR_ERR(key);
@@ -1053,10 +1037,6 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, 
	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name,

	       content);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	ret = -EINVAL;

	if (strlen(content) >= AFSPATHMAX)

		goto error;
@@ -1127,10 +1107,6 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	       new_dvnode->fid.vid, new_dvnode->fid.vnode,

	       new_dentry->d_name.name);



	ret = -ENAMETOOLONG;

	if (new_dentry->d_name.len >= AFSNAMEMAX)

		goto error;



	key = afs_request_key(orig_dvnode->volume->cell);

	if (IS_ERR(key)) {

		ret = PTR_ERR(key);

CRA Git | Maintained and supported by SUSTech CRA and CCSE