[DLM] cancel in conversion deadlock [4/6]
commitc85d65e91430db94ae9ce0cf38b56e496658b642
authorDavid Teigland <teigland@redhat.com>
Fri, 18 May 2007 14:01:26 +0000 (18 09:01 -0500)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 9 Jul 2007 07:22:38 +0000 (9 08:22 +0100)
tree5ab6e0399594df5fa53793ca8f922e0a55f0aca3
parentd7db923ea4990edb5583bf54af868ba687a1bc84
[DLM] cancel in conversion deadlock [4/6]

When conversion deadlock is detected, cancel the conversion and return
EDEADLK to the application.  This is a new default behavior where before
the dlm would allow the deadlock to exist indefinately.

The DLM_LKF_NODLCKWT flag can now be used in a conversion to prevent the
dlm from performing conversion deadlock detection/cancelation on it.
The DLM_LKF_CONVDEADLK flag can continue to be used as before to tell the
dlm to demote the granted mode of the lock being converted if it gets into
a conversion deadlock.

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/dlm/lock.c
include/linux/dlm.h