Patch "ufs: Fix warning from unlock_new_inode()" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

ufs: Fix warning from unlock_new_inode()

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ufs-fix-warning-from-unlock_new_inode.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Jan Kara <[email protected]>
Date: Mon, 1 Jun 2015 14:52:04 +0200
Subject: ufs: Fix warning from unlock_new_inode()

From: Jan Kara <[email protected]>

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()

---
 fs/ufs/namei.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

@@ -174,7 +174,12 @@ static int ufs_link (struct dentry * old
 	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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/ufs-fix-possible-deadlock-when-looking-up-directories.patch queue-4.0/ufs-fix-warning-from-unlock_new_inode.patch queue-4.0/fs-ufs-restore-s_lock-mutex.patch queue-4.0/fs-ufs-revert-ufs-fix-deadlocks-introduced-by-sb-mutex-merge.patch queue-4.0/fs-fix-s_nosec-handling.patch