From: Martin Schwenke <martin@meltin.net>
Date: Tue, 20 Mar 2018 09:42:21 +0000 (+1100)
Subject: ctdb-tests: 60.nfs.sh simple 80 column fixups and reordering
X-Git-Tag: talloc-2.1.13~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44b29982f41729fbf7cae903f768b384e4a28824;p=thirdparty%2Fsamba.git

ctdb-tests: 60.nfs.sh simple 80 column fixups and reordering

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/eventscripts/scripts/60.nfs.sh
index f22d3e00dc3..b91a5d96a68 100644
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/60.nfs.sh
@@ -25,7 +25,8 @@ setup_nfs ()
 		export CTDB_MANAGES_NFS="yes"
 
 		rpc_services_up \
-			"portmapper" "nfs" "mountd" "rquotad" "nlockmgr" "status"
+			"portmapper" "nfs" "mountd" "rquotad" \
+			"nlockmgr" "status"
 
 		nfs_setup_fake_threads "nfsd"
 		nfs_setup_fake_threads "rpc.foobar"  # Just set the variable to empty
@@ -90,20 +91,6 @@ nfs_setup_fake_threads ()
 	esac
 }
 
-program_stack_traces ()
-{
-	_prog="$1"
-	_max="${2:-1}"
-
-	_count=1
-	for _pid in ${FAKE_NFSD_THREAD_PIDS:-$FAKE_RPC_THREAD_PIDS} ; do
-		[ $_count -le $_max ] || break
-
-		program_stack_trace "$_prog" "$_pid"
-		_count=$(($_count + 1))
-	done
-}
-
 guess_output ()
 {
 	case "$1" in
@@ -217,6 +204,20 @@ program $_rpc_service${_ver:+ version }${_ver} is not available"
 	rm -f "$_out" "$_rc_file"
 }
 
+program_stack_traces ()
+{
+	_prog="$1"
+	_max="${2:-1}"
+
+	_count=1
+	for _pid in ${FAKE_NFSD_THREAD_PIDS:-$FAKE_RPC_THREAD_PIDS} ; do
+		[ $_count -le $_max ] || break
+
+		program_stack_trace "$_prog" "$_pid"
+		_count=$(($_count + 1))
+	done
+}
+
 # Run an NFS eventscript iteratively.
 #
 # - 1st argument is the number of iterations.