Commit f0230294 authored Nov 13, 2013 by Linus Torvalds

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

fs/dlm/lockspace.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)