Messages in this thread Patch in this message | | | Date | Thu, 13 Nov 2008 13:42:30 -0600 | From | David Teigland <> | Subject | [GIT PULL] dlm fix for 2.6.28-rc4 |
| |
Linus,
Please pull a dlm regression fix (included below) for 2.6.28-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git for-linus
Thanks, Dave
From 278afcbf4fe964230eba67f8fb8235e8b7e63ffb Mon Sep 17 00:00:00 2001 From: David Teigland <teigland@redhat.com> Date: Thu, 13 Nov 2008 13:22:34 -0600 Subject: [PATCH] dlm: fix shutdown cleanup
Fixes a regression from commit 0f8e0d9a317406612700426fad3efab0b7bbc467, "dlm: allow multiple lockspace creates".
An extraneous 'else' slipped into a code fragment being moved from release_lockspace() to dlm_release_lockspace(). The result of the unwanted 'else' is that dlm threads and structures are not stopped and cleaned up when the final dlm lockspace is removed. Trying to create a new lockspace again afterward will fail with "kmem_cache_create: duplicate cache dlm_conn" because the cache was not previously destroyed.
Signed-off-by: David Teigland <teigland@redhat.com> --- 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 d910501..8d86b79 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); -- 1.5.5.1
| |