1 files changed, 1 insertions, 28 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index ceb7b491d1b9..34226c20d196 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1889,40 +1889,13 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode)
         spin_lock(&inode->i_lock);
         __d_instantiate(entry, inode);
         WARN_ON(!(inode->i_state & I_NEW));
-        inode->i_state &= ~I_NEW;
+        inode->i_state &= ~I_NEW & ~I_CREATING;
         smp_mb();
         wake_up_bit(&inode->i_state, __I_NEW);
         spin_unlock(&inode->i_lock);
 }
 EXPORT_SYMBOL(d_instantiate_new);
 
-/**
- * d_instantiate_no_diralias - instantiate a non-aliased dentry
- * @entry: dentry to complete
- * @inode: inode to attach to this dentry
- *
- * Fill in inode information in the entry.  If a directory alias is found, then
- * return an error (and drop inode).  Together with d_materialise_unique() this
- * guarantees that a directory inode may never have more than one alias.
- */
-int d_instantiate_no_diralias(struct dentry *entry, struct inode *inode)
-{
-        BUG_ON(!hlist_unhashed(&entry->d_u.d_alias));
-
-        security_d_instantiate(entry, inode);
-        spin_lock(&inode->i_lock);
-        if (S_ISDIR(inode->i_mode) && !hlist_empty(&inode->i_dentry)) {
-                spin_unlock(&inode->i_lock);
-                iput(inode);
-                return -EBUSY;
-        }
-        __d_instantiate(entry, inode);
-        spin_unlock(&inode->i_lock);
-
-        return 0;
-}
-EXPORT_SYMBOL(d_instantiate_no_diralias);
-
 struct dentry *d_make_root(struct inode *root_inode)
 {
         struct dentry *res = NULL;