From: Frank Cusack Date: Thu, 10 May 2007 23:44:12 +0000 (+0000) Subject: STABLE14-fix-partition-check-20070510 X-Git-Tag: openafs-stable-1_4_5-pre1~123 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fcdcec3526b4baba72353e11be2b43e53f7fbc7e;p=packages%2Fo%2Fopenafs.git STABLE14-fix-partition-check-20070510 oops (cherry picked from commit 08cbee9b2d941d79b9f7919f4c76b1ab45ef3643) --- diff --git a/src/vol/partition.c b/src/vol/partition.c index 30e61d739..748975a38 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -440,14 +440,14 @@ VAttachPartitions(void) /* 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"))) + ((!(strcmp(mnt.mnt_fstype, "ufs") && + strcmp(mnt.mnt_fstype, "zfs")))) #else - (strcmp(mnt.mnt_fstype, "ufs") != 0) + (strcmp(mnt.mnt_fstype, "ufs") != 0) #endif - || (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0)) + || (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0)) continue; - + /* If we're going to always attach this partition, do it later. */ if (VIsAlwaysAttach(mnt.mnt_mountp)) continue;