From b3ce627af18ebe84436cea57c60544bc74b9026b Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Thu, 17 Feb 2011 15:00:06 -0500 Subject: [PATCH] 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 Tested-by: Derrick Brashear --- src/config/param.amd64_fbsd_72.h | 1 + src/config/param.amd64_fbsd_73.h | 1 + src/config/param.amd64_fbsd_74.h | 2 ++ src/config/param.amd64_fbsd_82.h | 1 + src/config/param.i386_fbsd_72.h | 1 + src/config/param.i386_fbsd_73.h | 1 + src/config/param.i386_fbsd_74.h | 2 ++ src/config/param.i386_fbsd_82.h | 1 + 8 files changed, 10 insertions(+) diff --git a/src/config/param.amd64_fbsd_72.h b/src/config/param.amd64_fbsd_72.h index cece49e13..d3854159c 100644 --- 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 140985ccf..4b8448429 100644 --- 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 2844f9afa..97e796c19 100644 --- 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 438c524fb..03cf23ec3 100644 --- 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 c8444cc75..143c36598 100644 --- 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 22d9b55af..d0f1eb617 100644 --- 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 3180a1261..2b57a55b0 100644 --- 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 4ccad470b..a9dbda12c 100644 --- 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 -- 2.39.5