fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"
authorFabian Frederick <fabf@skynet.be>
Wed, 10 Jun 2015 00:09:32 +0000 (10:09 +1000)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 14 Jun 2015 15:31:51 +0000 (11:31 -0400)
commit13b987ea275840d74d9df9a44326632fab1894da
tree8d64f6ad319fe214e7ead9a0336a1b35207a4387
parent3f4a9494104cbadfa05cb2da9ca04b205712360f
fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"

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

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Suggested-by: Jan 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: Andrew Morton <akpm@linux-foundation.org>
fs/ufs/inode.c
fs/ufs/namei.c