Merge branch 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 5c2b953c352db259e648707d5e67dea4457885d0..a09419379f5db033d2c0315ae379180f73d6cff5 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1474,43 +1474,36 @@ 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)
-{
-       struct dentry *old;
-
-       /* Don't create child dentry for a dead directory. */
-       if (unlikely(IS_DEADDIR(dir))) {
-               dput(dentry);
-               return ERR_PTR(-ENOENT);
-       }
-
-       old = dir->i_op->lookup(dir, dentry, flags);
-       if (unlikely(old)) {
-               dput(dentry);
-               dentry = old;
-       }
-       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);
+       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)))
+               return ERR_PTR(-ENOENT);
+
        dentry = d_alloc(base, name);
        if (unlikely(!dentry))
                return ERR_PTR(-ENOMEM);
 
-       return lookup_real(base->d_inode, dentry, flags);
+       old = dir->i_op->lookup(dir, dentry, flags);
+       if (unlikely(old)) {
+               dput(dentry);
+               dentry = old;
+       }
+       return dentry;
 }
 
 static int lookup_fast(struct nameidata *nd,