Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup

Browse source 
lookup_hash() with LOOKUP_PARENT is bogus. And this prepares to add
new intent on those path.

The user of LOOKUP_PARENT intent is nfs only, and it checks whether
nd->flags has LOOKUP_CREATE or LOOKUP_OPEN, so the result is same.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
This commit is contained in:
OGAWA Hirofumi 2008-10-16 07:50:29 +09:00 • committed by Al Viro
parent 8f3dfaa5ba
commit 0612d9fb27
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs/namei.c
View file

@ -2170,16 +2170,19 @@ static long do_rmdir(int dfd, const char __user *pathname)
return error; return error;
switch(nd.last_type) { switch(nd.last_type) {
case LAST_DOTDOT: case LAST_DOTDOT:
error = -ENOTEMPTY; error = -ENOTEMPTY;
goto exit1; goto exit1;
case LAST_DOT: case LAST_DOT:
error = -EINVAL; error = -EINVAL;
goto exit1; goto exit1;
case LAST_ROOT: case LAST_ROOT:
error = -EBUSY; error = -EBUSY;
goto exit1; goto exit1;
} }
nd.flags &= ~LOOKUP_PARENT;
mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
dentry = lookup_hash(&nd); dentry = lookup_hash(&nd);
error = PTR_ERR(dentry); error = PTR_ERR(dentry);
@ -2257,6 +2260,9 @@ static long do_unlinkat(int dfd, const char __user *pathname)
error = -EISDIR; error = -EISDIR;
if (nd.last_type != LAST_NORM) if (nd.last_type != LAST_NORM)
goto exit1; goto exit1;
nd.flags &= ~LOOKUP_PARENT;
mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
dentry = lookup_hash(&nd); dentry = lookup_hash(&nd);
error = PTR_ERR(dentry); error = PTR_ERR(dentry);
@ -2646,6 +2652,9 @@ asmlinkage long sys_renameat(int olddfd, const char __user *oldname,
if (newnd.last_type != LAST_NORM) if (newnd.last_type != LAST_NORM)
goto exit2; goto exit2;
oldnd.flags &= ~LOOKUP_PARENT;
newnd.flags &= ~LOOKUP_PARENT;
trap = lock_rename(new_dir, old_dir); trap = lock_rename(new_dir, old_dir);
old_dentry = lookup_hash(&oldnd); old_dentry = lookup_hash(&oldnd);