Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b423653 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2d1595ad 278afcbf

fs/dlm/lockspace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -812,7 +812,7 @@ int dlm_release_lockspace(void *lockspace, int force) 
	error = release_lockspace(ls, force);

	error = release_lockspace(ls, force);

	if (!error)

	if (!error)

		ls_count--;

		ls_count--;

	else if (!ls_count)

	if (!ls_count)

		threads_stop();

		threads_stop();

	mutex_unlock(&ls_lock);

	mutex_unlock(&ls_lock);