mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 02:10:52 +07:00
[PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
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:
parent
8f3dfaa5ba
commit
0612d9fb27
27
fs/namei.c
27
fs/namei.c
@ -2170,16 +2170,19 @@ static long do_rmdir(int dfd, const char __user *pathname)
|
||||
return error;
|
||||
|
||||
switch(nd.last_type) {
|
||||
case LAST_DOTDOT:
|
||||
error = -ENOTEMPTY;
|
||||
goto exit1;
|
||||
case LAST_DOT:
|
||||
error = -EINVAL;
|
||||
goto exit1;
|
||||
case LAST_ROOT:
|
||||
error = -EBUSY;
|
||||
goto exit1;
|
||||
case LAST_DOTDOT:
|
||||
error = -ENOTEMPTY;
|
||||
goto exit1;
|
||||
case LAST_DOT:
|
||||
error = -EINVAL;
|
||||
goto exit1;
|
||||
case LAST_ROOT:
|
||||
error = -EBUSY;
|
||||
goto exit1;
|
||||
}
|
||||
|
||||
nd.flags &= ~LOOKUP_PARENT;
|
||||
|
||||
mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
|
||||
dentry = lookup_hash(&nd);
|
||||
error = PTR_ERR(dentry);
|
||||
@ -2257,6 +2260,9 @@ static long do_unlinkat(int dfd, const char __user *pathname)
|
||||
error = -EISDIR;
|
||||
if (nd.last_type != LAST_NORM)
|
||||
goto exit1;
|
||||
|
||||
nd.flags &= ~LOOKUP_PARENT;
|
||||
|
||||
mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
|
||||
dentry = lookup_hash(&nd);
|
||||
error = PTR_ERR(dentry);
|
||||
@ -2646,6 +2652,9 @@ asmlinkage long sys_renameat(int olddfd, const char __user *oldname,
|
||||
if (newnd.last_type != LAST_NORM)
|
||||
goto exit2;
|
||||
|
||||
oldnd.flags &= ~LOOKUP_PARENT;
|
||||
newnd.flags &= ~LOOKUP_PARENT;
|
||||
|
||||
trap = lock_rename(new_dir, old_dir);
|
||||
|
||||
old_dentry = lookup_hash(&oldnd);
|
||||
|
Loading…
Reference in New Issue
Block a user