[Cluster-devel] cluster/rgmanager/src/resources clusterfs.sh fs.sh
lhh at sourceware.org
lhh at sourceware.org
Thu Oct 5 21:57:17 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: lhh at sourceware.org 2006-10-05 21:57:17
Modified files:
rgmanager/src/resources: clusterfs.sh fs.sh
Log message:
Fix 208656, pass 1
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/clusterfs.sh.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.9&r2=1.1.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/fs.sh.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.15&r2=1.4.2.16
--- cluster/rgmanager/src/resources/clusterfs.sh 2006/06/16 19:57:52 1.1.2.9
+++ cluster/rgmanager/src/resources/clusterfs.sh 2006/10/05 21:57:17 1.1.2.10
@@ -802,6 +802,7 @@
[ "$OCF_RESKEY_nfslock" = "1" ]; then
ocf_log warning "Dropping node-wide NFS locks"
mkdir -p $mp/.clumanager/statd
+ pkill -KILL -x lockd
# Copy out the notify list; our
# IPs are already torn down
if notify_list_store $mp/.clumanager/statd; then
--- cluster/rgmanager/src/resources/fs.sh 2006/08/11 15:02:29 1.4.2.15
+++ cluster/rgmanager/src/resources/fs.sh 2006/10/05 21:57:17 1.4.2.16
@@ -857,14 +857,14 @@
mp=${OCF_RESKEY_mountpoint}
case "$mp" in
""|"[ ]*") # nothing to mount
- return $SUCCESS
+ return $OCF_SUCCESS
;;
/*) # found it
;;
*) # invalid format
ocf_log err \
"startFilesystem: Invalid mount point format (must begin with a '/'): \'$mp\'"
- return $FAIL
+ return $OCF_ERR_ARGS
;;
esac
@@ -875,7 +875,7 @@
if [ -z "$dev" ]; then
ocf_log err "\
startFilesystem: Could not match $OCF_RESKEY_device with a real device"
- return $FAIL
+ return $OCF_ERR_ARGS
fi
#
@@ -885,7 +885,7 @@
if ! [ -d "$mp" ]; then
ocf_log err"\
startFilesystem: Mount point $mp exists but is not a directory"
- return $FAIL
+ return $OCF_ERR_ARGS
fi
else
ocf_log err "\
@@ -914,7 +914,7 @@
case $? in
$YES) # already mounted
ocf_log debug "$dev already mounted"
- return $SUCCESS
+ return $OCF_SUCCESS
;;
$NO) # not mounted, continue
;;
More information about the Cluster-devel
mailing list