summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-06-01 14:52:04 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-06-16 02:08:07 -0400
commit12ecbb4b1d765a5076920999298d9625439dbe58 (patch)
tree7258ed0900b8b37a724eb35c9a834e059440787a /fs
parentcdd9eefdf905e92e7fc6cc393314efe68dc6ff66 (diff)
downloadop-kernel-dev-12ecbb4b1d765a5076920999298d9625439dbe58.zip
op-kernel-dev-12ecbb4b1d765a5076920999298d9625439dbe58.tar.gz
ufs: Fix warning from unlock_new_inode()
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ufs/namei.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 1f5223c..2346b83 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;
}
OpenPOWER on IntegriCloud