diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:33:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:33:16 -0400 |
| commit | 2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6 (patch) | |
| tree | 2bfc3434e4c35d4eb91e5c3c02714c1fd2b83afb /include/linux | |
| parent | 5fe3a5ae5c09d53b2b3c7a971e1d87ab3a747055 (diff) | |
| parent | 269cddd44e3588d1c50a7ec055b78de4d6c72cb6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: Fix dlm lock status block comment in dlm.h
dlm: Don't send callback to node making lock request when "try 1cb" fails
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dlm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 0b3518c42356..d4e02f5353a0 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h | |||
| @@ -48,10 +48,10 @@ typedef void dlm_lockspace_t; | |||
| 48 | * | 48 | * |
| 49 | * 0 if lock request was successful | 49 | * 0 if lock request was successful |
| 50 | * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE | 50 | * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE |
| 51 | * -ENOMEM if there is no memory to process request | ||
| 52 | * -EINVAL if there are invalid parameters | ||
| 53 | * -DLM_EUNLOCK if unlock request was successful | 51 | * -DLM_EUNLOCK if unlock request was successful |
| 54 | * -DLM_ECANCEL if a cancel completed successfully | 52 | * -DLM_ECANCEL if a cancel completed successfully |
| 53 | * -EDEADLK if a deadlock was detected | ||
| 54 | * -ETIMEDOUT if the lock request was canceled due to a timeout | ||
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #define DLM_SBF_DEMOTED 0x01 | 57 | #define DLM_SBF_DEMOTED 0x01 |