cluster: STABLE3 - cman init: do a better check to umount configfs

cluster: STABLE3 - cman init: do a better check to umount configfs

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=795a8720eb1cffdf405500c41a2d17666fb9053a
Commit:        795a8720eb1cffdf405500c41a2d17666fb9053a
Parent:        b6b4535b787c9968c5b1e8f118fa4b7f04f691ef
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Mar 25 12:57:08 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 27 20:05:45 2009 +0100

cman init: do a better check to umount configfs

dlm is a configfs user. Once we modprobe dlm and mount configfs,
the "ls -1" check will always avoid configfs umount.

Do a very soft attempt to remove the kernel modules we load without failing
if they are in use. If we succeed to remove the modules and there are no
more users for configfs, then umount it.

One catch 22 note is that we need to modprobe -r configfs only after it is
umounted, so perform that operation exclusively after we umount.
No failure is reported or generated as there might be other users around.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index de90e31..3b38ca5 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -493,8 +493,9 @@ stop_configfs()
 	if mtab_configfs && [ -z "$(ls -1 /sys/kernel/config)" ]; then
 		errmsg=$( /bin/umount /sys/kernel/config 2>&1 )
 		if [ $? -ne 0 ]; then
-			echo -n $errmsg " "
+			return 1
 		fi
+		/sbin/modprobe -r configfs > /dev/null 2>&1 || true
 	fi
 	return 0
 }
@@ -568,6 +569,12 @@ stop_fence_xvmd()
 	return $?
 }
 
+unload_modules()
+{
+	/sbin/modprobe -r lock_dlm > /dev/null 2>&1 || true
+	/sbin/modprobe -r dlm > /dev/null 2>&1 || true
+}
+
 stop()
 {
 	echo "Stopping cluster: "
@@ -618,6 +625,10 @@ stop()
 		nok
 	fi
 
+	echo -n "   Unloading modules..."
+	unload_modules
+	ok
+
 	echo -n "   Unmounting configfs... "
 	if stop_configfs; then
 		ok