From: Robert Banz <banz@umbc.edu>
Date: Tue, 20 Mar 2007 19:02:10 +0000 (+0000)
Subject: STABLE14-namei-allow-zfs-20070320
X-Git-Tag: openafs-stable-1_4_5-pre1~141
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cc98ae391738f981d4b4e19a3b90579ed8717a12;p=packages%2Fo%2Fopenafs.git

STABLE14-namei-allow-zfs-20070320


don't force AlwaysAttach on ZFS in namei


(cherry picked from commit af0a976f1151f7ca7642013357d1dcc7267c6457)
---

diff --git a/src/vol/partition.c b/src/vol/partition.c
index f8aa3a81d..30e61d739 100644
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -437,8 +437,15 @@ VAttachPartitions(void)
     }
     while (!getmntent(mntfile, &mnt)) {
 	/* Ignore non ufs or non read/write partitions */
-	if ((strcmp(mnt.mnt_fstype, "ufs") != 0)
-	    || (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0))
+	/* but allow zfs too if we're in the NAMEI environment */
+	if (
+#ifdef AFS_NAMEI_ENV
+	((!strcmp(mnt.mnt_fstype, "ufs") &&
+	  !strcmp(mnt.mnt_fstype, "zfs")))
+#else
+	(strcmp(mnt.mnt_fstype, "ufs") != 0)
+#endif
+	|| (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0))
 	    continue;
 
 	/* If we're going to always attach this partition, do it later. */