]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
fileserver: Fix NeverAttach support
authorSimon Wilkinson <sxw@your-file-system.com>
Sun, 8 Apr 2012 12:58:25 +0000 (13:58 +0100)
committerStephan Wiesand <stephan.wiesand@desy.de>
Fri, 30 Aug 2013 14:05:44 +0000 (07:05 -0700)
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 <jaltman@secure-endpoints.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 709a6358e1d1f6cc0b025522e1e595c50bb2b733)

Change-Id: I2f142084fdb4e66c3e7841c9ac961cab417633a0
Reviewed-on: http://gerrit.openafs.org/9471
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/vol/partition.c

index a8edaf1855bb72d2182adb2c95a6a9b5bdbfdf31..1b889195654aa84eb1040385746b6181fafa11af 100644 (file)
@@ -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. */