ext2: make sure that partially set up inodes won't be returned by ext2_iget()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

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;