diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /fs/dlm/lockspace.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'fs/dlm/lockspace.c')
| -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 | ||