diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:16 -0700 |
| commit | 2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6 (patch) | |
| tree | 2bfc3434e4c35d4eb91e5c3c02714c1fd2b83afb | |
| parent | 5fe3a5ae5c09d53b2b3c7a971e1d87ab3a747055 (diff) | |
| parent | 269cddd44e3588d1c50a7ec055b78de4d6c72cb6 (diff) | |
| download | linux-2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6.tar.gz linux-2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6.tar.bz2 linux-2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6.zip | |
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
| -rw-r--r-- | fs/dlm/lock.c | 3 | ||||
| -rw-r--r-- | include/linux/dlm.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 031dbe3a15ca..64e5f3efdd81 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -1846,6 +1846,9 @@ static void send_bast_queue(struct dlm_rsb *r, struct list_head *head, struct dlm_lkb *gr; list_for_each_entry(gr, head, lkb_statequeue) { + /* skip self when sending basts to convertqueue */ + if (gr == lkb) + continue; if (gr->lkb_bastfn && modes_require_bast(gr, lkb)) { queue_bast(r, gr, lkb->lkb_rqmode); gr->lkb_highbast = lkb->lkb_rqmode; 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 |