From: Hans-Werner Paulsen <hans@MPA-Garching.MPG.DE>
Date: Fri, 21 Dec 2012 08:05:19 +0000 (+0059)
Subject: Do not call afs_MarinerLog when afs_mariner is not set
X-Git-Tag: upstream/1.6.2_pre3^2~9
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fa0c841d2b8fdf8bb77fac871358995271bedfda;p=packages%2Fo%2Fopenafs.git

Do not call afs_MarinerLog when afs_mariner is not set

When mariner log is not set up (afs_mariner=0), do not call afs_MarinerLog,
otherwise a osi_NetSend() to hostaddress=0 is tried, which will give you
ICMP messages in the socket error queue.
Do not call afs_AddMarinerName, when afs_mariner is not set.

(cherry picked from commit 41f8d6b9239d8ee1ca786c0485bea4251c96b9e5)

Change-Id: Id9584b07a0d3726fdd2176ac04945f976255e2d4
Reviewed-on: http://gerrit.openafs.org/8801
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c
index edd75a835..f8371e20c 100644
--- a/src/afs/VNOPS/afs_vnop_create.c
+++ b/src/afs/VNOPS/afs_vnop_create.c
@@ -486,10 +486,12 @@ afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
 	afs_PutVolume(volp, READ_LOCK);
 
     if (code == 0) {
-	afs_AddMarinerName(aname, *avcp);
+	if (afs_mariner)
+	    afs_AddMarinerName(aname, *avcp);
 	/* return the new status in vattr */
 	afs_CopyOutAttrs(*avcp, attrs);
-	afs_MarinerLog("store$Creating", *avcp);
+	if (afs_mariner)
+	    afs_MarinerLog("store$Creating", *avcp);
     }
 
     afs_PutFakeStat(&fakestate);
diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index f4f28dac0..d076a0d35 100644
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -1384,7 +1384,6 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
     int pass = 0, hit = 0;
     int force_eval = afs_fakestat_enable ? 0 : 1;
     long dirCookie;
-    extern afs_int32 afs_mariner;	/*Writing activity to log? */
     afs_hyper_t versionNo;
     int no_read_access = 0;
     struct sysname_info sysState;	/* used only for @sys checking */
diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index b50f06b27..308f8f39e 100644
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -124,7 +124,8 @@ afsremove(struct vcache *adp, struct dcache *tdc,
      * call FindVCache instead of GetVCache since if the file's really
      * gone, we won't be able to fetch the status info anyway.  */
     if (tvc) {
-	afs_MarinerLog("store$Removing", tvc);
+	if (afs_mariner)
+	    afs_MarinerLog("store$Removing", tvc);
 #ifdef AFS_BOZONLOCK_ENV
 	afs_BozonLock(&tvc->pvnLock, tvc);
 	/* Since afs_TryToSmush will do a pvn_vptrunc */
diff --git a/src/afs/afs_warn.c b/src/afs/afs_warn.c
index 8ec43343b..d8bdddc01 100644
--- a/src/afs/afs_warn.c
+++ b/src/afs/afs_warn.c
@@ -150,7 +150,8 @@ afs_warnuser(char *fmt, ...)
 	/* mariner log the warning */
 	snprintf(buf, sizeof(buf), "warn$");
 	vsnprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), fmt, ap);
-	afs_MarinerLog(buf, NULL);
+	if (afs_mariner)
+	    afs_MarinerLog(buf, NULL);
 	va_end(ap);
 	va_start(ap, fmt);
 	vprintf(fmt, ap);