AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-20 06:06:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

untangling do_lookup() - merge failure exits in !dentry case

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-03-30 14:37:42 -04:00
parent d774a058d9
commit ec335e91a4
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/namei.c
View File

@ -1176,35 +1176,28 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
dentry = d_lookup(parent, name);
if (dentry && d_need_lookup(dentry)) {
dentry = d_inode_lookup(parent, dentry, nd);
if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry);
}
} else if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
goto l;
}
if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
status = d_revalidate(dentry, nd);
if (unlikely(status <= 0)) {
if (status < 0) {
mutex_unlock(&dir->i_mutex);
dput(dentry);
return status;
dentry = ERR_PTR(status);
goto l;
}
if (!d_invalidate(dentry)) {
dput(dentry);
dentry = d_alloc_and_lookup(parent, name, nd);
if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry);
}
}
}
} else if (!dentry) {
dentry = d_alloc_and_lookup(parent, name, nd);
if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry);
}
}
l:
mutex_unlock(&dir->i_mutex);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
goto done;
}
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)