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

Pull vfs icache updates from Al Viro:

 - NFS mkdir/open_by_handle race fix

 - analogous solution for FUSE, replacing the one currently in mainline

 - new primitive to be used when discarding halfway set up inodes on
   failed object creation; gives sane warranties re icache lookups not
   returning such doomed by still not freed inodes. A bunch of
   filesystems switched to that animal.

 - Miklos' fix for last cycle regression in iget5_locked(); -stable will
   need a slightly different variant, unfortunately.

 - misc bits and pieces around things icache-related (in adfs and jfs).

* 'work.mkdir' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  jfs: don't bother with make_bad_inode() in ialloc()
  adfs: don't put inodes into icache
  new helper: inode_fake_hash()
  vfs: don't evict uninitialized inode
  jfs: switch to discard_new_inode()
  ext2: make sure that partially set up inodes won't be returned by ext2_iget()
  udf: switch to discard_new_inode()
  ufs: switch to discard_new_inode()
  btrfs: switch to discard_new_inode()
  new primitive: discard_new_inode()
  kill d_instantiate_no_diralias()
  nfs_instantiate(): prevent multiple aliases for directory inode

2 files changed, 4 insertions, 8 deletions

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 6484199b35d1..5c3d7b7e4975 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -611,8 +611,7 @@ fail_drop:
         dquot_drop(inode);
         inode->i_flags |= S_NOQUOTA;
         clear_nlink(inode);
-        unlock_new_inode(inode);
-        iput(inode);
+        discard_new_inode(inode);
         return ERR_PTR(err);
 
 fail:
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 152453a91877..0c26dcc5d850 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -45,8 +45,7 @@ static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode)
                 return 0;
         }
         inode_dec_link_count(inode);
-        unlock_new_inode(inode);
-        iput(inode);
+        discard_new_inode(inode);
         return err;
 }
 
@@ -192,8 +191,7 @@ out:
 
 out_fail:
         inode_dec_link_count(inode);
-        unlock_new_inode(inode);
-        iput (inode);
+        discard_new_inode(inode);
         goto out;
 }
 
@@ -261,8 +259,7 @@ out:
 out_fail:
         inode_dec_link_count(inode);
         inode_dec_link_count(inode);
-        unlock_new_inode(inode);
-        iput(inode);
+        discard_new_inode(inode);
 out_dir:
         inode_dec_link_count(dir);
         goto out;