Commit 7b423653 authored Nov 13, 2008 by Linus Torvalds

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 shutdown cleanup

fs/dlm/lockspace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -812,7 +812,7 @@ int dlm_release_lockspace(void *lockspace, int force)
		error = release_lockspace(ls, force);
		if (!error)
		ls_count--;
		else if (!ls_count)
		if (!ls_count)
		threads_stop();
		mutex_unlock(&ls_lock);