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

Commit 13b987ea authored by Fabian Frederick's avatar Fabian Frederick Committed by Al Viro
Browse files

fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge" 



This reverts commit 9ef7db7f ("ufs: fix deadlocks introduced by sb
mutex merge") That patch tried to solve commit 0244756e ("ufs: sb
mutex merge + mutex_destroy") which is itself partially reverted due to
multiple deadlocks.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: Roger Pau Monne <roger.pau@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 3f4a9494

fs/ufs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -902,6 +902,9 @@ void ufs_evict_inode(struct inode * inode) 
	invalidate_inode_buffers(inode);

	clear_inode(inode);



	if (want_delete)

	if (want_delete) {

		lock_ufs(inode->i_sb);

		ufs_free_inode(inode);

		unlock_ufs(inode->i_sb);

	}

}

fs/ufs/namei.c

+8 −6
Original line number Diff line number Diff line
@@ -128,12 +128,12 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, 
	if (l > sb->s_blocksize)

		goto out_notlocked;



	lock_ufs(dir->i_sb);

	inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);

	err = PTR_ERR(inode);

	if (IS_ERR(inode))

		goto out_notlocked;

		goto out;



	lock_ufs(dir->i_sb);

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

		/* slow symlink */

		inode->i_op = &ufs_symlink_inode_operations;
@@ -184,9 +184,13 @@ 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);

	err = PTR_ERR(inode);

	if (IS_ERR(inode))

		return PTR_ERR(inode);

		goto out_dir;



	inode->i_op = &ufs_dir_inode_operations;

	inode->i_fop = &ufs_dir_operations;
@@ -194,9 +198,6 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 


	inode_inc_link_count(inode);



	lock_ufs(dir->i_sb);

	inode_inc_link_count(dir);



	err = ufs_make_empty(inode, dir);

	if (err)

		goto out_fail;
@@ -215,6 +216,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode) 
	inode_dec_link_count(inode);

	unlock_new_inode(inode);

	iput (inode);

out_dir:

	inode_dec_link_count(dir);

	unlock_ufs(dir->i_sb);

	goto out;