Commit f0230294 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 39222c82 a97f4a66
...@@ -706,9 +706,7 @@ static int lkb_idr_is_local(int id, void *p, void *data) ...@@ -706,9 +706,7 @@ static int lkb_idr_is_local(int id, void *p, void *data)
{ {
struct dlm_lkb *lkb = p; struct dlm_lkb *lkb = p;
if (!lkb->lkb_nodeid) return lkb->lkb_nodeid == 0 && lkb->lkb_grmode != DLM_LOCK_IV;
return 1;
return 0;
} }
static int lkb_idr_is_any(int id, void *p, void *data) static int lkb_idr_is_any(int id, void *p, void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment