diff options
| author | Jan Kara <jack@suse.cz> | 2015-06-01 14:52:04 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-20 21:12:43 -0400 |
| commit | 529a7fac10b86e5496de18164190260dff24b3ca (patch) | |
| tree | 61b384905911d5d9045e0d02a008c7f56320215f | |
| parent | e4102c423958dc4c88a5e4062f66976974709a6d (diff) | |
ufs: Fix warning from unlock_new_inode()
[ Upstream commit 12ecbb4b1d765a5076920999298d9625439dbe58 ]
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: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | fs/ufs/namei.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c index 65158994af19..3812cf78353f 100644 --- 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; } |