ufs: Fix warning from unlock_new_inode()

commit 12ecbb4b1d765a5076920999298d9625439dbe58 upstream.

Commit e4502c63f56aeca88 (ufs: deal with nfsd/iget races) introduced
unlock_new_inode() call into ufs_add_nondir(). However that function
gets called also from ufs_link() which hands it already initialized
inode and thus unlock_new_inode() complains. The problem is harmless but
annoying.

Fix the problem by opencoding necessary stuff in ufs_link()

Fixes: e4502c63f56aeca887ced37f24e0def1ef11cec8
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 6515899..3812cf7 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -174,7 +174,12 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
        inode_inc_link_count(inode);
        ihold(inode);
 
-       error = ufs_add_nondir(dentry, inode);
+       error = ufs_add_link(dentry, inode);
+       if (error) {
+               inode_dec_link_count(inode);
+               iput(inode);
+       } else
+               d_instantiate(dentry, inode);
        unlock_ufs(dir->i_sb);
        return error;
 }