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

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

ufs: don't bother with lock_ufs()/unlock_ufs() for directory access 



We are already serialized by ->i_mutex and operations on different
directories are independent.  These calls are just rudiments of
blind BKL conversion and they should've been removed back then.

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

fs/ufs/namei.c

+14 −40
Original line number Diff line number Diff line
@@ -56,11 +56,9 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, unsi 
	if (dentry->d_name.len > UFS_MAXNAMLEN)

		return ERR_PTR(-ENAMETOOLONG);



	lock_ufs(dir->i_sb);

	ino = ufs_inode_by_name(dir, &dentry->d_name);

	if (ino)

		inode = ufs_iget(dir->i_sb, ino);

	unlock_ufs(dir->i_sb);

	return d_splice_alias(inode, dentry);

}
@@ -76,24 +74,16 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode, 
		bool excl)

{

	struct inode *inode;

	int err;



	UFSD("BEGIN\n");



	inode = ufs_new_inode(dir, mode);

	err = PTR_ERR(inode);

	if (IS_ERR(inode))

		return PTR_ERR(inode);



	if (!IS_ERR(inode)) {

	inode->i_op = &ufs_file_inode_operations;

	inode->i_fop = &ufs_file_operations;

	inode->i_mapping->a_ops = &ufs_aops;

	mark_inode_dirty(inode);

		lock_ufs(dir->i_sb);

		err = ufs_add_nondir(dentry, inode);

		unlock_ufs(dir->i_sb);

	}

	UFSD("END: err=%d\n", err);

	return err;

	return ufs_add_nondir(dentry, inode);

}



static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
@@ -110,9 +100,7 @@ static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev 
		init_special_inode(inode, mode, rdev);

		ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);

		mark_inode_dirty(inode);

		lock_ufs(dir->i_sb);

		err = ufs_add_nondir(dentry, inode);

		unlock_ufs(dir->i_sb);

	}

	return err;

}
@@ -121,18 +109,17 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, 
	const char * symname)

{

	struct super_block * sb = dir->i_sb;

	int err = -ENAMETOOLONG;

	int err;

	unsigned l = strlen(symname)+1;

	struct inode * inode;



	if (l > sb->s_blocksize)

		goto out_notlocked;

		return -ENAMETOOLONG;



	lock_ufs(dir->i_sb);

	inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);

	err = PTR_ERR(inode);

	if (IS_ERR(inode))

		goto out;

		return err;



	if (l > UFS_SB(sb)->s_uspi->s_maxsymlinklen) {

		/* slow symlink */
@@ -149,17 +136,13 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, 
	}

	mark_inode_dirty(inode);



	err = ufs_add_nondir(dentry, inode);

out:

	unlock_ufs(dir->i_sb);

out_notlocked:

	return err;

	return ufs_add_nondir(dentry, inode);



out_fail:

	inode_dec_link_count(inode);

	unlock_new_inode(inode);

	iput(inode);

	goto out;

	return err;

}



static int ufs_link (struct dentry * old_dentry, struct inode * dir,
@@ -168,8 +151,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir, 
	struct inode *inode = d_inode(old_dentry);

	int error;



	lock_ufs(dir->i_sb);



	inode->i_ctime = CURRENT_TIME_SEC;

	inode_inc_link_count(inode);

	ihold(inode);
@@ -180,7 +161,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir, 
		iput(inode);

	} else

		d_instantiate(dentry, inode);

	unlock_ufs(dir->i_sb);

	return error;

}
@@ -189,7 +169,6 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 
	struct inode * inode;

	int err;



	lock_ufs(dir->i_sb);

	inode_inc_link_count(dir);



	inode = ufs_new_inode(dir, S_IFDIR|mode);
@@ -210,12 +189,10 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 
	err = ufs_add_link(dentry, inode);

	if (err)

		goto out_fail;

	unlock_ufs(dir->i_sb);



	unlock_new_inode(inode);

	d_instantiate(dentry, inode);

out:

	return err;

	return 0;



out_fail:

	inode_dec_link_count(inode);
@@ -224,8 +201,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 
	iput (inode);

out_dir:

	inode_dec_link_count(dir);

	unlock_ufs(dir->i_sb);

	goto out;

	return err;

}



static int ufs_unlink(struct inode *dir, struct dentry *dentry)
@@ -255,7 +231,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry) 
	struct inode * inode = d_inode(dentry);

	int err= -ENOTEMPTY;



	lock_ufs(dir->i_sb);

	if (ufs_empty_dir (inode)) {

		err = ufs_unlink(dir, dentry);

		if (!err) {
@@ -264,7 +239,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry) 
			inode_dec_link_count(dir);

		}

	}

	unlock_ufs(dir->i_sb);

	return err;

}