From: Simon Wilkinson Date: Sun, 8 Apr 2012 12:58:25 +0000 (+0100) Subject: fileserver: Fix NeverAttach support X-Git-Tag: upstream/1.6.6_pre2^2~108 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bad0b13a17183c93c926c694270dc18964ff443c;p=packages%2Fo%2Fopenafs.git fileserver: Fix NeverAttach support Commit 35becabed870d4bfe49abaa499d99a3ffb0a2d31 added support for the /vicepXX/NeverAttach. However this code only appears to work on Linux. It fails build testing on (at least) Mac OS X, FreeBSD, and AIX. Modify the code so that the NeverAttach call uses the same variable to locate the path of the partition as the AlwaysAttach call does. Reviewed-on: http://gerrit.openafs.org/7125 Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 709a6358e1d1f6cc0b025522e1e595c50bb2b733) Change-Id: I2f142084fdb4e66c3e7841c9ac961cab417633a0 Reviewed-on: http://gerrit.openafs.org/9471 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand Tested-by: Stephan Wiesand --- diff --git a/src/vol/partition.c b/src/vol/partition.c index a8edaf185..1b8891956 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -548,7 +548,7 @@ VAttachPartitions(void) continue; /* Skip this Partition? */ - if (VIsNeverAttach(mntent->mnt_dir)) + if (VIsNeverAttach(mnt.mnt_mountp)) continue; /* If we're going to always attach this partition, do it later. */ @@ -698,7 +698,7 @@ VAttachPartitions(void) #endif /* Skip this Partition? */ - if (VIsNeverAttach(mntent->mnt_dir)) + if (VIsNeverAttach(part)) continue; /* If we're going to always attach this partition, do it later. */ @@ -732,7 +732,7 @@ VAttachPartitions(void) continue; /* Skip this Partition? */ - if (VIsNeverAttach(mntent->mnt_dir)) + if (VIsNeverAttach(fsent->fs_file)) continue; /* If we're going to always attach this partition, do it later. */