untangling do_lookup() - merge d_alloc_and_lookup() callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-03-30 14:39:15 -04:00
parent ec335e91a4
commit a6ecdfcfba

View file

@ -1188,12 +1188,12 @@ retry:
} }
if (!d_invalidate(dentry)) { if (!d_invalidate(dentry)) {
dput(dentry); dput(dentry);
dentry = d_alloc_and_lookup(parent, name, nd); dentry = NULL;
} }
} }
} else if (!dentry) {
dentry = d_alloc_and_lookup(parent, name, nd);
} }
if (!dentry)
dentry = d_alloc_and_lookup(parent, name, nd);
l: l:
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
if (IS_ERR(dentry)) if (IS_ERR(dentry))