From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 21 May 2012 23:01:49 +0000 (-0500)
Subject: afsd: Avoid printing cacheBaseDir for memcache
X-Git-Tag: upstream/1.6.2_pre2^2~168
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b2079ef799f45efe2a59f4d20ef482ebf1d2b584;p=packages%2Fo%2Fopenafs.git

afsd: Avoid printing cacheBaseDir for memcache

cacheBaseDir is NULL when memcache is turned on; don't print it.

Reviewed-on: http://gerrit.openafs.org/7443
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 9eb924f16c6f3bb06d83ed281317f2ba29473202)

Change-Id: Ie5dce3a3ae12b2725c90475cd3f6718f9df63134
Reviewed-on: http://gerrit.openafs.org/7500
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 5822530f5..aa6b2cc3b 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -2410,13 +2410,13 @@ afsd_run(void)
      * Give the kernel the names of the AFS files cached on the workstation's
      * disk.
      */
-    if (afsd_debug)
-	printf
-	    ("%s: Calling AFSOP_CACHEFILE for each of the %d files in '%s'\n",
-	     rn, cacheFiles, cacheBaseDir);
     if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) {
-	/* ... and again ... */
 	int nocachefile = 0;
+	if (afsd_debug)
+	    printf
+	        ("%s: Calling AFSOP_CACHEFILE for each of the %d files in '%s'\n",
+	         rn, cacheFiles, cacheBaseDir);
+	/* ... and again ... */
 	for (currVFile = 0; currVFile < cacheFiles; currVFile++) {
 	    if (!nocachefile) {
 		sprintf(fullpn_VFile, "%s/D%d/V%d", cacheBaseDir, dir_for_V[currVFile], currVFile);