STABLE14-namei-allow-zfs-20070320

don't force AlwaysAttach on ZFS in namei


(cherry picked from commit af0a976f1151f7ca7642013357d1dcc7267c6457)
This commit is contained in:
Robert Banz 2007-03-20 19:02:10 +00:00 committed by Derrick Brashear
parent 3f85007dfb
commit cc98ae3917

View File

@ -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. */