From: Rainer Schöpf <rainer.schoepf@proteosys.com>
Date: Thu, 8 Jul 2004 05:52:38 +0000 (+0000)
Subject: afsd-bitch-about-xfs-not-about-dir-for-memcache-20040708
X-Git-Tag: openafs-devel-1_3_66~69
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=85a973a7b997b66d009e46c8b4116c00e1182b3c

afsd-bitch-about-xfs-not-about-dir-for-memcache-20040708

FIXES 5728

make afsd complain if cache partition is linux
don't complain if no cachedir and we're -memcache.
---

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index e403fc7..6954bd6 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -1049,6 +1049,8 @@ CheckCacheBaseDir(char *dir)
 	}
 	if (statfsbuf.f_type == 0x52654973) {	/* REISERFS_SUPER_MAGIC */
 	    return "cannot use reiserfs as cache partition";
+	} else if  (statfsbuf.f_type == 0x58465342) { /* XFS_SUPER_MAGIC */
+	    return "cannot use xfs as cache partition";
 	}
     }
 #endif
@@ -1638,7 +1640,7 @@ mainproc(as, arock)
     sprintf(fullpn_VFile, "%s/", cacheBaseDir);
     vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
 
-    if ((fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
+    if  (!(cacheFlags & AFSCALL_INIT_MEMCACHE) && (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
 	printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
     }
 #if 0