ufs: switch to discard_new_inode()

we don't want open-by-handle to pick an in-core inode that
has failed setup halfway through.

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

2 files changed, 4 insertions, 8 deletions

diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index e1ef0f0a1353..02c0a4be4212 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -343,8 +343,7 @@ cg_found:
 fail_remove_inode:
         mutex_unlock(&sbi->s_lock);
         clear_nlink(inode);
-        unlock_new_inode(inode);
-        iput(inode);
+        discard_new_inode(inode);
         UFSD("EXIT (FAILED): err %d\n", err);
         return ERR_PTR(err);
 failed:
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index d5f43ba76c59..9ef40f100415 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -43,8 +43,7 @@ static inline int ufs_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;
 }
 
@@ -142,8 +141,7 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,
 
 out_fail:
         inode_dec_link_count(inode);
-        unlock_new_inode(inode);
-        iput(inode);
+        discard_new_inode(inode);
         return err;
 }
 
@@ -198,8 +196,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
 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);
         return err;