From: Goldwyn Rodrigues <rgoldwyn@gmail.com>
Date: Thu, 20 Aug 2009 18:43:19 +0000 (-0500)
Subject: ocfs2/dlm: Wait on lockres instead of erroring cancel requests
X-Git-Tag: v2.6.31-rc8~39^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c795b33ba171e41563ab7e25105c0cd4edd81cd7;p=pandora-kernel.git

ocfs2/dlm: Wait on lockres instead of erroring cancel requests

In case a downconvert is queued, and a flock receives a signal,
BUG_ON(lockres->l_action != OCFS2_AST_INVALID) is triggered
because a lock cancel triggers a dlmunlock while an AST is
scheduled.

To avoid this, allow a LKM_CANCEL to pass through, and let it
wait on __dlm_wait_on_lockres().

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.de>
Acked-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
---

Reading git-diff-tree failed