Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4502c63 authored by Al Viro's avatar Al Viro
Browse files

ufs: deal with nfsd/iget races 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2c80929c

fs/ufs/ialloc.c

+5 −1
Original line number Diff line number Diff line
@@ -298,7 +298,10 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) 
	ufsi->i_oeftflag = 0;

	ufsi->i_dir_start_lookup = 0;

	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);



	if (uspi->fs_magic == UFS2_MAGIC) {
@@ -337,6 +340,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) 
fail_remove_inode:

	unlock_ufs(sb);

	clear_nlink(inode);

	unlock_new_inode(inode);

	iput(inode);

	UFSD("EXIT (FAILED): err %d\n", err);

	return ERR_PTR(err);

fs/ufs/namei.c

+4 −0
Original line number Diff line number Diff line
@@ -38,10 +38,12 @@ static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode) 
{

	int err = ufs_add_link(dentry, inode);

	if (!err) {

		unlock_new_inode(inode);

		d_instantiate(dentry, inode);

		return 0;

	}

	inode_dec_link_count(inode);

	unlock_new_inode(inode);

	iput(inode);

	return err;

}
@@ -155,6 +157,7 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, 


out_fail:

	inode_dec_link_count(inode);

	unlock_new_inode(inode);

	iput(inode);

	goto out;

}
@@ -210,6 +213,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 
out_fail:

	inode_dec_link_count(inode);

	inode_dec_link_count(inode);

	unlock_new_inode(inode);

	iput (inode);

	inode_dec_link_count(dir);

	unlock_ufs(dir->i_sb);