From: Perry Ruiter <pruiter@sinenomine.net>
Date: Mon, 31 Mar 2014 11:42:22 +0000 (-0700)
Subject: afs: Suppress duplicate message on Linux
X-Git-Tag: upstream/1.8.0_pre1^2~700
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0287086fa78f0bc0012325c2eadb3dccb6b1f766;p=packages%2Fo%2Fopenafs.git

afs: Suppress duplicate message on Linux

Update afs_util.c to call afs_warnall in places where afs_warn and
afs_warnuser are called back to back with identical parameters.

Change-Id: I529344dea12149d8f18ec38bb17418c703f7d26b
Reviewed-on: http://gerrit.openafs.org/11006
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
---

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index bd406163a..dcf4d99cd 100644
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -214,12 +214,9 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
 		" (multi-homed address; other same-host interfaces may still be down)\n";
 	}
     }
-    afs_warn("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24),
+    afs_warnall("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24),
 	     (address >> 16) & 0xff, (address >> 8) & 0xff, (address) & 0xff,
 	     aserver->cell->cellName, postamble, code, ptr);
-    afs_warnuser("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24),
-		 (address >> 16) & 0xff, (address >> 8) & 0xff,
-		 (address) & 0xff, aserver->cell->cellName, postamble, code, ptr);
 
     if (flag == 1 && rxconn) {
 	/* server was marked down, check Rx to see if this was possibly due to
@@ -232,14 +229,7 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
 	    if (!errmsg) {
 		errmsg = str1 = str2 = "";
 	    }
-	    afs_warn("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n",
-	             (address >> 24),
-	             (address >> 16) & 0xff,
-	             (address >> 8) & 0xff,
-	             (address) & 0xff,
-	             (int)ntohs(sa->sa_portal),
-	             errorigin, errtype, errcode, str1, errmsg, str2);
-	    afs_warnuser("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n",
+	    afs_warnall("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n",
 	             (address >> 24),
 	             (address >> 16) & 0xff,
 	             (address >> 8) & 0xff,