Commit 12ecbb4b authored by Jan Kara's avatar Jan Kara Committed by Al Viro

ufs: Fix warning from unlock_new_inode()

Commit e4502c63 (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

Fix the problem by opencoding necessary stuff in ufs_link()

Fixes: e4502c63Signed-off-by: default avatarJan Kara <[email protected]>
Signed-off-by: default avatarAl Viro <[email protected]>
parent cdd9eefd
...@@ -174,7 +174,12 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir, ...@@ -174,7 +174,12 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
inode_inc_link_count(inode); inode_inc_link_count(inode);
ihold(inode); ihold(inode);
error = ufs_add_nondir(dentry, inode); error = ufs_add_link(dentry, inode);
if (error) {
} else
d_instantiate(dentry, inode);
unlock_ufs(dir->i_sb); unlock_ufs(dir->i_sb);
return error; return error;
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment