mirror of
https://github.com/torvalds/linux.git
synced 2024-10-26 15:02:39 +00:00
ufs: Fix warning from unlock_new_inode()
Commite4502c63f5
(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:e4502c63f5
Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
cdd9eefdf9
commit
12ecbb4b1d
|
@ -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) {
|
||||||
|
inode_dec_link_count(inode);
|
||||||
|
iput(inode);
|
||||||
|
} else
|
||||||
|
d_instantiate(dentry, inode);
|
||||||
unlock_ufs(dir->i_sb);
|
unlock_ufs(dir->i_sb);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user