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:41:36 +0000 (16:41 -0700)
commit1bc668d6789ba22cf7d77a2cae59e53e5ef0ffc4
tree15b2149514544da629593406e8ccb13a19a77fbb
parent0da49f317e018cae5d9146ea7abf7ed47335273a
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