From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Fri, 16 Jul 2010 15:13:33 +0000 (+0800)
Subject: ocfs2/dlm: fix a dead lock
X-Git-Tag: v2.6.36-rc1~40^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d98c3ccb52f692f1a60339dde7c700686a5568b;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed