]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ocfs2/dlm: fix a dead lock
authorWengang Wang <wen.gang.wang@oracle.com>
Fri, 16 Jul 2010 15:13:33 +0000 (23:13 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 26 Aug 2010 23:45:46 +0000 (16:45 -0700)
commit3730039f40020c1f8d1d94752ecbd1375cf705f9
treef7b6a7c3884ca0218697f7b98c9b79407eff3df7
parent15ddf0fc153f54ed7c8432a18fa1ecde1a32d4bc
ocfs2/dlm: fix a dead lock

commit 6d98c3ccb52f692f1a60339dde7c700686a5568b upstream.

When we have to take both dlm->master_lock and lockres->spinlock,
take them in order

lockres->spinlock and then dlm->master_lock.

The patch fixes a violation of the rule.
We can simply move taking dlm->master_lock to where we have dropped res->spinlock
since when we access res->state and free mle memory we don't need master_lock's
protection.

Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/ocfs2/dlm/dlmmaster.c