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 /fs/dlm | |
| 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
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/lock.c | 3 |
1 files changed, 3 insertions, 0 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; |