diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 14:56:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 14:56:05 -0500 |
| commit | 7b423653964b22e6ca1a1ffd84816d619d6a3976 (patch) | |
| tree | a005620261a8830c86261733d0f1198d2303335b /fs | |
| parent | 2d1595ad8766c9cbab81d259168c00261d382ac5 (diff) | |
| parent | 278afcbf4fe964230eba67f8fb8235e8b7e63ffb (diff) | |
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) | |||
| 812 | error = release_lockspace(ls, force); | 812 | error = release_lockspace(ls, force); |
| 813 | if (!error) | 813 | if (!error) |
| 814 | ls_count--; | 814 | ls_count--; |
| 815 | else if (!ls_count) | 815 | if (!ls_count) |
| 816 | threads_stop(); | 816 | threads_stop(); |
| 817 | mutex_unlock(&ls_lock); | 817 | mutex_unlock(&ls_lock); |
| 818 | 818 | ||