lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

untangling do_lookup() - massage !dentry case towards __lookup_hash()

Browse Source 
Reorder if-else cases for starters...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2012-03-30 14:34:00 -04:00
parent 08b0ab7c20
commit d774a058d9
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/namei.c
View File

@@ -1174,23 +1174,13 @@ retry:
mutex_lock(&dir->i_mutex); mutex_lock(&dir->i_mutex);
dentry = d_lookup(parent, name); dentry = d_lookup(parent, name);
if (likely(!dentry)) { if (dentry && d_need_lookup(dentry)) {
dentry = d_alloc_and_lookup(parent, name, nd);
if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry);
}
/* known good */
status = 1;
} else if (unlikely(d_need_lookup(dentry))) {
dentry = d_inode_lookup(parent, dentry, nd); dentry = d_inode_lookup(parent, dentry, nd);
if (IS_ERR(dentry)) { if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry); return PTR_ERR(dentry);
} }
/* known good */ } else if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
status = 1;
} else if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
status = d_revalidate(dentry, nd); status = d_revalidate(dentry, nd);
if (unlikely(status <= 0)) { if (unlikely(status <= 0)) {
if (status < 0) { if (status < 0) {
@@ -1205,8 +1195,13 @@ retry:
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry); return PTR_ERR(dentry);
} }
/* known good */ }
status = 1; }
} else if (!dentry) {
dentry = d_alloc_and_lookup(parent, name, nd);
if (IS_ERR(dentry)) {
mutex_unlock(&dir->i_mutex);
return PTR_ERR(dentry);
} }
} }
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);