diff options
| author | David Teigland <teigland@redhat.com> | 2007-05-18 09:01:26 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-07-09 08:22:38 +0100 |
| commit | c85d65e91430db94ae9ce0cf38b56e496658b642 (patch) | |
| tree | 5ab6e0399594df5fa53793ca8f922e0a55f0aca3 /include/linux/dlm.h | |
| parent | d7db923ea4990edb5583bf54af868ba687a1bc84 (diff) | |
| download | linux-stable-c85d65e91430db94ae9ce0cf38b56e496658b642.tar.gz linux-stable-c85d65e91430db94ae9ce0cf38b56e496658b642.tar.bz2 linux-stable-c85d65e91430db94ae9ce0cf38b56e496658b642.zip | |
[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>
Diffstat (limited to 'include/linux/dlm.h')
| -rw-r--r-- | include/linux/dlm.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 975f17d8aa53..5227a9594f9d 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h @@ -85,7 +85,11 @@ * Only relevant to locks originating in userspace. A persistent lock will not * be removed if the process holding the lock exits. * - * DLM_LKF_NODLKWT + * DLM_LKF_NODLCKWT + * + * Do not cancel the lock if it gets into conversion deadlock. + * Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN. + * * DLM_LKF_NODLCKBLK * * net yet implemented |