From: Simon Wilkinson Date: Sun, 8 Apr 2012 12:58:25 +0000 (+0100) Subject: fileserver: Fix NeverAttach support X-Git-Tag: upstream/1.8.0_pre1^2~2611 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=709a6358e1d1f6cc0b025522e1e595c50bb2b733;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. Change-Id: Ic87e112f362ac6d23376fb0a263d021c29c0b06e Reviewed-on: http://gerrit.openafs.org/7125 Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/vol/partition.c b/src/vol/partition.c index 95bb8a8cf..100414607 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -501,7 +501,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. */ @@ -651,7 +651,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. */ @@ -685,7 +685,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. */