Pull in 64BIT_ENV for FBSD

Support for some newer FreeBSD versions was added after we killed
AFS_64BIT_ENV, but the commit to kill it was not cherry-picked
to openafs-stable-1_6_x.  Cherry-picking the new version support
thus introduced a bug, as we still need to define AFS_64BIT_ENV
for these systems on this branch.

We attempted to fix this previously, but that fix was incomplete.
Apply the full fix now.

A direct commit to openafs-stable-1_6_x, as this change is not
relevant for master.

Change-Id: If83edd51552f4719ed80179f7d7423ab15bbb0cb
Reviewed-on: http://gerrit.openafs.org/3976
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/config/param.amd64_fbsd_72.h b/src/config/param.amd64_fbsd_72.h
index cece49e136462fea48d2d469ee811e3020afae59..d3854159cfe969ad8d12aaf7c479d1a0c2e8e1f5 100644 (file)
--- a/src/config/param.amd64_fbsd_72.h
+++ b/src/config/param.amd64_fbsd_72.h
@@ -157,6 +157,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BITPOINTER_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1

diff --git a/src/config/param.amd64_fbsd_73.h b/src/config/param.amd64_fbsd_73.h
index 140985ccf4e8894519db1fcbd348b6bab6fe4399..4b844842982b1305b954c1a39dcddb4df3313b5c 100644 (file)
--- a/src/config/param.amd64_fbsd_73.h
+++ b/src/config/param.amd64_fbsd_73.h
@@ -160,6 +160,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BITPOINTER_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1

diff --git a/src/config/param.amd64_fbsd_74.h b/src/config/param.amd64_fbsd_74.h
index 2844f9afa2e393e35e845672ab803c6a30c7c690..97e796c19d3a6e08de5cee4dab7fc6cea30f8c9a 100644 (file)
--- a/src/config/param.amd64_fbsd_74.h
+++ b/src/config/param.amd64_fbsd_74.h
@@ -22,6 +22,7 @@
 #define AFS_X86_XBSD_ENV 1
 
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_CLIENT 1
 #define AFS_64BITPOINTER_ENV 1
 #define AFS_64BITUSERPOINTER_ENV       1
@@ -162,6 +163,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BITPOINTER_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1

diff --git a/src/config/param.amd64_fbsd_82.h b/src/config/param.amd64_fbsd_82.h
index 438c524fbeb4d4574d0ccb301e96a1b24544be45..03cf23ec31965b943d7584fd1d29fe415f34d5a9 100644 (file)
--- a/src/config/param.amd64_fbsd_82.h
+++ b/src/config/param.amd64_fbsd_82.h
@@ -163,6 +163,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BITPOINTER_ENV  1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1

diff --git a/src/config/param.i386_fbsd_72.h b/src/config/param.i386_fbsd_72.h
index c8444cc758cc0d4031bbfbefc7a54a239dbe775e..143c36598721b2f2b81161eba4154fcfa4951bd9 100644 (file)
--- a/src/config/param.i386_fbsd_72.h
+++ b/src/config/param.i386_fbsd_72.h
@@ -156,6 +156,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1
 #define RXK_LISTENER_ENV      1

diff --git a/src/config/param.i386_fbsd_73.h b/src/config/param.i386_fbsd_73.h
index 22d9b55af26ee07f4035e256cd60233c756ea9f0..d0f1eb617c15993ffe7901fe1cdef376fbaa4e6f 100644 (file)
--- a/src/config/param.i386_fbsd_73.h
+++ b/src/config/param.i386_fbsd_73.h
@@ -159,6 +159,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1
 #define RXK_LISTENER_ENV      1

diff --git a/src/config/param.i386_fbsd_74.h b/src/config/param.i386_fbsd_74.h
index 3180a126146a30812aef3afad7191540f63840c8..2b57a55b00a28c526f07de410d596a11ee827fb8 100644 (file)
--- a/src/config/param.i386_fbsd_74.h
+++ b/src/config/param.i386_fbsd_74.h
@@ -23,6 +23,7 @@
 #define AFS_X86_XBSD_ENV 1
 
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_CLIENT 1
 #define AFS_64BIT_IOPS_ENV 1   /* Needed for NAMEI */
 #define AFS_FBSD_ENV 1
@@ -161,6 +162,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1
 #define RXK_LISTENER_ENV      1

diff --git a/src/config/param.i386_fbsd_82.h b/src/config/param.i386_fbsd_82.h
index 4ccad470bfe9ad0f13d9d740e510a15ff02ddbbc..a9dbda12c1beea43e02748392cabdc65308a7e18 100644 (file)
--- a/src/config/param.i386_fbsd_82.h
+++ b/src/config/param.i386_fbsd_82.h
@@ -162,6 +162,7 @@ enum vcexcl { NONEXCL, EXCL };
 #define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
 #define AFS_SYSCALL 339
 #define AFS_NAMEI_ENV         1        /* User space interface to file system */
+#define AFS_64BIT_ENV 1
 #define AFS_64BIT_IOPS_ENV    1        /* Needed for NAMEI */
 #define AFS_USERSPACE_IP_ADDR 1
 #define RXK_LISTENER_ENV      1