tree c43eabf9914d413d49d0bb650314295ac9e613c2
parent 6eda3dd33f8a0ce58ee56a11351758643a698db4
author Wengang Wang <wen.gang.wang@oracle.com> 1279293213 +0800
committer Joel Becker <joel.becker@oracle.com> 1281203060 -0700

ocfs2/dlm: fix a dead lock

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>
Cc: stable@kernel.org
Signed-off-by: Joel Becker <joel.becker@oracle.com>