From: Ion Badulescu <ib42@cs.columbia.edu>
Date: Sun, 29 Dec 2002 01:51:25 +0000 (+0000)
Subject: 	* amd/srvr_nfs.c (start_nfs_pings): don't set FSF_PINGING if
X-Git-Tag: am-utils-6_1b2~13
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=2ebe32f1b126fb958e9bd5b57e424b4f8f74c2df;p=am-utils-6.0.git

	* amd/srvr_nfs.c (start_nfs_pings): don't set FSF_PINGING if
	pings are disabled
---

diff --git a/ChangeLog b/ChangeLog
index 5d4a36c..5978597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-12-28  Ion Badulescu  <ionut@moisil.badula.org>
 
+	* amd/srvr_nfs.c (start_nfs_pings): don't set FSF_PINGING if
+	pings are disabled
+
 	* libamu/xdr_func.c (xdr_ftype): use a local enum_t variable
 	instead of casting the pointer to (enum_t *)
 	(xdr_mountstat3): ditto
diff --git a/amd/srvr_nfs.c b/amd/srvr_nfs.c
index e96bb69..448aeaf 100644
--- a/amd/srvr_nfs.c
+++ b/amd/srvr_nfs.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: srvr_nfs.c,v 1.22 2002/12/27 22:43:53 ezk Exp $
+ * $Id: srvr_nfs.c,v 1.23 2002/12/29 01:51:26 ib42 Exp $
  *
  */
 
@@ -577,19 +577,20 @@ nfs_srvr_port(fserver *fs, u_short *port, voidp wchan)
 static void
 start_nfs_pings(fserver *fs, int pingval)
 {
-  if (!(fs->fs_flags & FSF_PINGING)) {
-    fs->fs_flags |= FSF_PINGING;
-    if (fs->fs_cid)
-      untimeout(fs->fs_cid);
-    if (pingval < 0) {
-      srvrlog(fs, "wired up (pings disabled)");
-      fs->fs_flags |= FSF_VALID;
-      fs->fs_flags &= ~FSF_DOWN;
-    } else {
-      nfs_keepalive(fs);
-    }
-  } else {
+  if (fs->fs_flags & FSF_PINGING) {
     dlog("Already running pings to %s", fs->fs_host);
+    return;
+  }
+
+  if (fs->fs_cid)
+    untimeout(fs->fs_cid);
+  if (pingval < 0) {
+    srvrlog(fs, "wired up (pings disabled)");
+    fs->fs_flags |= FSF_VALID;
+    fs->fs_flags &= ~FSF_DOWN;
+  } else {
+    fs->fs_flags |= FSF_PINGING;
+    nfs_keepalive(fs);
   }
 }