From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20887 invoked by alias); 4 Feb 2009 21:14:32 -0000 Received: (qmail 20881 invoked by alias); 4 Feb 2009 21:14:32 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL4 - dlm-kernel: fix2 prevent dlm module unload following emergency shutdown To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 89a5f2ec8c20c252296e214cf60d32ad74e32a75 X-Git-Newrev: e253ffddacd851318cacf777a0d95bee757ebd1e From: David Teigland Message-Id: <20090204211009.B2F651205B3@lists.fedorahosted.org> Date: Wed, 04 Feb 2009 21:14:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00380.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e253ffddacd851318cacf777a0d95bee757ebd1e Commit: e253ffddacd851318cacf777a0d95bee757ebd1e Parent: 89a5f2ec8c20c252296e214cf60d32ad74e32a75 Author: David Teigland AuthorDate: Wed Feb 4 15:06:34 2009 -0600 Committer: David Teigland CommitterDate: Wed Feb 4 15:06:34 2009 -0600 dlm-kernel: fix2 prevent dlm module unload following emergency shutdown bz 467040 It seems that dlm_emergency_shutdown() is called even when shutdowns are normal/clean, but doesn't do anything. So, only do the __module_get() if dlm_emergency_shutdown finds lockspaces to clear. Include the number of lockspace's cleared in the printk at the end. Signed-off-by: David Teigland --- dlm-kernel/src/lockspace.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlm-kernel/src/lockspace.c b/dlm-kernel/src/lockspace.c index a7f78ef..b36fd02 100644 --- a/dlm-kernel/src/lockspace.c +++ b/dlm-kernel/src/lockspace.c @@ -601,16 +601,10 @@ void dlm_emergency_shutdown() { struct dlm_ls *ls; struct dlm_ls *tmp; + int count = 0; printk("WARNING: dlm_emergency_shutdown\n"); - /* prevent unloading since we cannot guarantee that slab - * caches are empty here. This prevents a warning when our - * module_exit tries to destroy the slab caches and - * possible oopsen if something accesses /proc/slabinfo - */ - __module_get(THIS_MODULE); - /* Shut lowcomms down to prevent any socket activity */ lowcomms_stop_accept(); @@ -621,15 +615,24 @@ void dlm_emergency_shutdown() /* Now try to clean the lockspaces */ spin_lock(&lslist_lock); + /* prevent unloading since we cannot guarantee that slab + * caches are empty here. This prevents a warning when our + * module_exit tries to destroy the slab caches and + * possible oopsen if something accesses /proc/slabinfo + */ + if (!list_empty(&lslist)) + __module_get(THIS_MODULE); + list_for_each_entry_safe(ls, tmp, &lslist, ls_list) { spin_unlock(&lslist_lock); release_lockspace(ls, 3); spin_lock(&lslist_lock); + count++; } spin_unlock(&lslist_lock); - printk("WARNING: dlm_emergency_shutdown\n"); + printk("WARNING: dlm_emergency_shutdown finished %d\n", count); } struct dlm_recover *allocate_dlm_recover(void)