summaryrefslogtreecommitdiffstats
path: root/include/linux/dlm.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2010-09-07 14:17:10 -0500
committerDavid Teigland <teigland@redhat.com>2010-09-07 14:17:10 -0500
commit269cddd44e3588d1c50a7ec055b78de4d6c72cb6 (patch)
treeaed50395fccbce0475f640557f65aaea2bd8140f /include/linux/dlm.h
parent314dd2a05340fffbe217c5e40ec6c3bd1d07bf89 (diff)
downloadlinux-stable-269cddd44e3588d1c50a7ec055b78de4d6c72cb6.tar.gz
linux-stable-269cddd44e3588d1c50a7ec055b78de4d6c72cb6.tar.bz2
linux-stable-269cddd44e3588d1c50a7ec055b78de4d6c72cb6.zip
dlm: Fix dlm lock status block comment in dlm.h
There is only one place in the dlm where the sb_status is set and that is queue_cast(). Tracing back the callers of that function shows that the listed set of return values is out of date, so here are an updated set. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'include/linux/dlm.h')
-rw-r--r--include/linux/dlm.h4
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;
*
* 0 if lock request was successful
* -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE
- * -ENOMEM if there is no memory to process request
- * -EINVAL if there are invalid parameters
* -DLM_EUNLOCK if unlock request was successful
* -DLM_ECANCEL if a cancel completed successfully
+ * -EDEADLK if a deadlock was detected
+ * -ETIMEDOUT if the lock request was canceled due to a timeout
*/
#define DLM_SBF_DEMOTED 0x01