eventscripts: Factor out common code from nfs_check_rpc_service()

This creates new function _nfs_check_rpc_common().

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/config/functions b/config/functions
index 94bf8723cec436a9598bf8afbbefed687f86cad3..d366125da77a3f32ce15bf637ee233b52d89ab44 100755 (executable)
--- a/config/functions
+++ b/config/functions
@@ -223,6 +223,22 @@ nfs_check_rpc_service ()
 {
     _prog_name="$1" ; shift
 
+    if _nfs_check_rpc_common "$_prog_name" ; then
+       return
+    fi
+
+    while [ -n "$3" ] ; do
+       if nfs_check_rpc_action "$1" "$2" "$3" ; then
+           break
+       fi
+       shift 3
+    done
+}
+
+_nfs_check_rpc_common ()
+{
+    _prog_name="$1"
+
     # Some platforms don't have separate programs for all services.
     case "$_prog_name" in
        statd)
@@ -272,12 +288,7 @@ nfs_check_rpc_service ()
 
     ctdb_counter_incr "$_service_name"
 
-    while [ -n "$3" ] ; do
-       if nfs_check_rpc_action "$1" "$2" "$3" ; then
-           break
-       fi
-       shift 3
-    done
+    return 1
 }
 
 nfs_check_rpc_action ()