From a03ece5ff2bd7a9abaa0e8ddfe5f79d79e5984c8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 8 Mar 2018 11:00:45 -0500 Subject: [PATCH] fold lookup_real() into __lookup_hash() Signed-off-by: Al Viro --- fs/namei.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 921ae32dbc80..a3cd028e8a9b 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1473,21 +1473,29 @@ static struct dentry *lookup_dcache(const struct qstr *name, } /* - * Call i_op->lookup on the dentry. The dentry must be negative and - * unhashed. - * - * dir->d_inode->i_mutex must be held + * Parent directory has inode locked exclusive. This is one + * and only case when ->lookup() gets called on non in-lookup + * dentries - as the matter of fact, this only gets called + * when directory is guaranteed to have no in-lookup children + * at all. */ -static struct dentry *lookup_real(struct inode *dir, struct dentry *dentry, - unsigned int flags) +static struct dentry *__lookup_hash(const struct qstr *name, + struct dentry *base, unsigned int flags) { + struct dentry *dentry = lookup_dcache(name, base, flags); struct dentry *old; + struct inode *dir = base->d_inode; + + if (dentry) + return dentry; /* Don't create child dentry for a dead directory. */ - if (unlikely(IS_DEADDIR(dir))) { - dput(dentry); + if (unlikely(IS_DEADDIR(dir))) return ERR_PTR(-ENOENT); - } + + dentry = d_alloc(base, name); + if (unlikely(!dentry)) + return ERR_PTR(-ENOMEM); old = dir->i_op->lookup(dir, dentry, flags); if (unlikely(old)) { @@ -1497,21 +1505,6 @@ static struct dentry *lookup_real(struct inode *dir, struct dentry *dentry, return dentry; } -static struct dentry *__lookup_hash(const struct qstr *name, - struct dentry *base, unsigned int flags) -{ - struct dentry *dentry = lookup_dcache(name, base, flags); - - if (dentry) - return dentry; - - dentry = d_alloc(base, name); - if (unlikely(!dentry)) - return ERR_PTR(-ENOMEM); - - return lookup_real(base->d_inode, dentry, flags); -} - static int lookup_fast(struct nameidata *nd, struct path *path, struct inode **inode, unsigned *seqp)