diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2008-11-13 11:56:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2008-11-13 11:56:05 -0800 |
| commit | 7b423653964b22e6ca1a1ffd84816d619d6a3976 (patch) | |
| tree | a005620261a8830c86261733d0f1198d2303335b /fs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| parent | dlm: fix shutdown cleanup (diff) | |
| download | linux-7b423653964b22e6ca1a1ffd84816d619d6a3976.tar.gz linux-7b423653964b22e6ca1a1ffd84816d619d6a3976.tar.bz2 linux-7b423653964b22e6ca1a1ffd84816d619d6a3976.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lockspace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index d910501de6d2..8d86b7960f0d 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -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); |