p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ufs: deal with nfsd/iget races 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-09-26 21:17:52 -04:00
parent 2c80929c4c
commit e4502c63f5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ufs/ialloc.c
View File

@ -298,7 +298,10 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
ufsi->i_oeftflag = 0; ufsi->i_oeftflag = 0;
ufsi->i_dir_start_lookup = 0; ufsi->i_dir_start_lookup = 0;
memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1)); memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1));
insert_inode_hash(inode); if (insert_inode_locked(inode) < 0) {
err = -EIO;
goto failed;
}
mark_inode_dirty(inode); mark_inode_dirty(inode);
if (uspi->fs_magic == UFS2_MAGIC) { if (uspi->fs_magic == UFS2_MAGIC) {
@ -337,6 +340,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
fail_remove_inode: fail_remove_inode:
unlock_ufs(sb); unlock_ufs(sb);
clear_nlink(inode); clear_nlink(inode);
unlock_new_inode(inode);
iput(inode); iput(inode);
UFSD("EXIT (FAILED): err %d\n", err); UFSD("EXIT (FAILED): err %d\n", err);
return ERR_PTR(err); return ERR_PTR(err);

4
fs/ufs/namei.c
View File

@ -38,10 +38,12 @@ static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
{ {
int err = ufs_add_link(dentry, inode); int err = ufs_add_link(dentry, inode);
if (!err) { if (!err) {
unlock_new_inode(inode);
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
return 0; return 0;
} }
inode_dec_link_count(inode); inode_dec_link_count(inode);
unlock_new_inode(inode);
iput(inode); iput(inode);
return err; return err;
} }
@ -155,6 +157,7 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,
out_fail: out_fail:
inode_dec_link_count(inode); inode_dec_link_count(inode);
unlock_new_inode(inode);
iput(inode); iput(inode);
goto out; goto out;
} }
@ -210,6 +213,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
out_fail: out_fail:
inode_dec_link_count(inode); inode_dec_link_count(inode);
inode_dec_link_count(inode); inode_dec_link_count(inode);
unlock_new_inode(inode);
iput (inode); iput (inode);
inode_dec_link_count(dir); inode_dec_link_count(dir);
unlock_ufs(dir->i_sb); unlock_ufs(dir->i_sb);