Skip to content

Commit

Permalink
ufs: Fix warning from unlock_new_inode()
Browse files Browse the repository at this point in the history
Commit e4502c6 (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: e4502c6
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Jan Kara authored and Al Viro committed Jun 16, 2015
1 parent cdd9eef commit 12ecbb4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion fs/ufs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 12ecbb4

Please sign in to comment.