diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:31:13 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:31:13 +0900 |
| commit | f0230294271f511b41797305b685365a9e569a09 (patch) | |
| tree | f6d2d36c414eeaf0c36061a25b80ba5f6b1e5644 /fs | |
| parent | Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubi (diff) | |
| parent | dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY (diff) | |
| download | linux-dev-f0230294271f511b41797305b685365a9e569a09.tar.xz linux-dev-f0230294271f511b41797305b685365a9e569a09.zip | |
Merge tag 'dlm-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fix from David Teigland:
"This set includes a single fix to resolve to a race that could cause
lockspace shutdown to incorrectly return -EBUSY"
* tag 'dlm-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lockspace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 88556dc0458e..d5abafd56a6d 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -706,9 +706,7 @@ static int lkb_idr_is_local(int id, void *p, void *data) { struct dlm_lkb *lkb = p; - if (!lkb->lkb_nodeid) - return 1; - return 0; + return lkb->lkb_nodeid == 0 && lkb->lkb_grmode != DLM_LOCK_IV; } static int lkb_idr_is_any(int id, void *p, void *data) |