From: Simon Wilkinson Date: Thu, 30 Sep 2010 12:58:26 +0000 (+0100) Subject: Kill AFS_64BIT_ENV X-Git-Tag: openafs-devel-1_7_1~1455 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=fc9aa428f4f9a5b5188ace7bfb0301a3a184e9c0 Kill AFS_64BIT_ENV The AFS_64BIT_ENV was being pretty much universally defined. So, remove the definition, and the conditional code that it controlled. From this point on, all platforms are assumed to be capable of handling 64bit values. Change-Id: I3e4bde502af9f33f6998637c288e8fd0898ffa81 Reviewed-on: http://gerrit.openafs.org/2870 Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index 07bd3fe..b329eee 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -784,12 +784,7 @@ SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep) cep->lock.pid_last_reader = 0; cep->lock.pid_writer = 0; cep->lock.src_indicator = 0; -#if !defined(AFS_64BIT_ENV) - cep->Length.high = scp->length.HighPart; - cep->Length.low = scp->length.LowPart; -#else cep->Length = (afs_int64) scp->length.QuadPart; -#endif cep->DataVersion = (afs_uint32)(scp->dataVersion & 0xFFFFFFFF); cep->callback = afs_data_pointer_to_int32(scp->cbServerp); if (scp->flags & CM_SCACHEFLAG_PURERO) { diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c index 5f980ff..0fee94a 100644 --- a/src/afs/afs_callback.c +++ b/src/afs/afs_callback.c @@ -234,12 +234,7 @@ SRXAFSCB_GetCE64(struct rx_call *a_call, afs_int32 a_index, a_result->lock.pid_writer = 0; a_result->lock.src_indicator = 0; #endif /* INSTRUMENT_LOCKS */ -#if !defined(AFS_64BIT_ENV) - a_result->Length.high = 0; - a_result->Length.low = tvc->f.m.Length; -#else a_result->Length = tvc->f.m.Length; -#endif a_result->DataVersion = hgetlo(tvc->f.m.DataVersion); a_result->callback = afs_data_pointer_to_int32(tvc->callback); /* XXXX Now a pointer; change it XXXX */ a_result->cbExpires = tvc->cbExpires; diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 54611ad..6abd176 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -244,7 +244,6 @@ afscdefs =\ -DAFS_FREELANCE_CLIENT \ -DAFS_64BITPOINTER_ENV \ -DAFS_64BITUSERPOINTER_ENV \ - -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ -D_USE_DECLSPECS_FOR_SAL=0 \ -D_USE_ATTRIBUTES_FOR_SAL=0 \ diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 141b3d1..151084e 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -248,7 +248,6 @@ afscdefs =\ -DNTDDI_VERSION=0x05000000 \ -DREGISTER_POWER_NOTIFICATIONS \ -DAFS_FREELANCE_CLIENT \ - -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ $(AFSDEV_AUXCDEFINES) diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 8d1f725..beb8ecc 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -252,7 +252,6 @@ afscdefs =\ -DWINVER=0x0500 \ -DREGISTER_POWER_NOTIFICATIONS \ -DAFS_FREELANCE_CLIENT \ - -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ $(AFSDEV_AUXCDEFINES) diff --git a/src/config/param.alpha_dux40.h b/src/config/param.alpha_dux40.h index 927c31c..1ee9813 100644 --- a/src/config/param.alpha_dux40.h +++ b/src/config/param.alpha_dux40.h @@ -22,7 +22,6 @@ #define __alpha 1 #define AFS_ALPHA_ENV 1 #define AFS_DECOSF_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_BOZONLOCK_ENV 1 #include @@ -138,7 +137,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ -#define AFS_64BIT_ENV 1 #define AFS_ENV 1 #define AFS_USR_OSF_ENV 1 #define AFS_USR_DUX40_ENV 1 diff --git a/src/config/param.alpha_dux50.h b/src/config/param.alpha_dux50.h index ddccdc5..61f03eb 100644 --- a/src/config/param.alpha_dux50.h +++ b/src/config/param.alpha_dux50.h @@ -24,7 +24,6 @@ #define AFS_ALPHA_ENV 1 #define AFS_DECOSF_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #include @@ -146,7 +145,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ -#define AFS_64BIT_ENV 1 #define AFS_ENV 1 #define AFS_USR_OSF_ENV 1 #define AFS_USR_DUX40_ENV 1 diff --git a/src/config/param.alpha_dux51.h b/src/config/param.alpha_dux51.h index f9b8e6b..79c41fc 100644 --- a/src/config/param.alpha_dux51.h +++ b/src/config/param.alpha_dux51.h @@ -25,7 +25,6 @@ #define AFS_ALPHA_ENV 1 #define AFS_DECOSF_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #include @@ -147,7 +146,6 @@ enum vcexcl { NONEXCL, EXCL }; #define UKERNEL 1 /* user space kernel */ #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ -#define AFS_64BIT_ENV 1 #define AFS_ENV 1 #define AFS_USR_OSF_ENV 1 #define AFS_USR_DUX40_ENV 1 diff --git a/src/config/param.alpha_nbsd15.h b/src/config/param.alpha_nbsd15.h index 3e1f782..2c3dc2f 100644 --- a/src/config/param.alpha_nbsd15.h +++ b/src/config/param.alpha_nbsd15.h @@ -8,8 +8,6 @@ #define AFS_ALPHA_ENV 1 #define AFS_ALPHA_XBSD_ENV 1 -#define AFS_64BIT_ENV 1 - #define SYS_NAME "alpha_nbsd15" #define SYS_NAME_ID SYS_NAME_ID_alpha_nbsd15 diff --git a/src/config/param.alpha_nbsd16.h b/src/config/param.alpha_nbsd16.h index 717d82a..b16e9e9 100644 --- a/src/config/param.alpha_nbsd16.h +++ b/src/config/param.alpha_nbsd16.h @@ -8,8 +8,6 @@ #define AFS_ALPHA_ENV 1 #define AFS_ALPHA_XBSD_ENV 1 -#define AFS_64BIT_ENV 1 - #define SYS_NAME "alpha_nbsd16" #define SYS_NAME_ID SYS_NAME_ID_alpha_nbsd16 diff --git a/src/config/param.amd64_fbsd_53.h b/src/config/param.amd64_fbsd_53.h index a9897bb..170c441 100644 --- a/src/config/param.amd64_fbsd_53.h +++ b/src/config/param.amd64_fbsd_53.h @@ -12,7 +12,6 @@ #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 @@ -137,7 +136,6 @@ 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_70.h b/src/config/param.amd64_fbsd_70.h index aa63705..47e0fda 100644 --- a/src/config/param.amd64_fbsd_70.h +++ b/src/config/param.amd64_fbsd_70.h @@ -22,7 +22,6 @@ #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 @@ -151,7 +150,6 @@ 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_71.h b/src/config/param.amd64_fbsd_71.h index e0e9d40..d3b8e38 100644 --- a/src/config/param.amd64_fbsd_71.h +++ b/src/config/param.amd64_fbsd_71.h @@ -22,7 +22,6 @@ #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 @@ -154,7 +153,6 @@ 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_80.h b/src/config/param.amd64_fbsd_80.h index 1efb350..77fe8a2 100644 --- a/src/config/param.amd64_fbsd_80.h +++ b/src/config/param.amd64_fbsd_80.h @@ -22,7 +22,6 @@ #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 @@ -157,7 +156,6 @@ 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_81.h b/src/config/param.amd64_fbsd_81.h index 1f4f497..0242d20 100644 --- a/src/config/param.amd64_fbsd_81.h +++ b/src/config/param.amd64_fbsd_81.h @@ -22,7 +22,6 @@ #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 @@ -160,7 +159,6 @@ 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_90.h b/src/config/param.amd64_fbsd_90.h index 3e220c7..fb9719d 100644 --- a/src/config/param.amd64_fbsd_90.h +++ b/src/config/param.amd64_fbsd_90.h @@ -22,7 +22,6 @@ #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 @@ -163,7 +162,6 @@ 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.arm_darwin_100.h b/src/config/param.arm_darwin_100.h index b5726ad..5b657c4 100644 --- a/src/config/param.arm_darwin_100.h +++ b/src/config/param.arm_darwin_100.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -153,7 +152,6 @@ struct rt_addrinfo { #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) || defined(__amd64__) diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h index d7eff82..8f0616b 100644 --- a/src/config/param.hp_ux110.h +++ b/src/config/param.hp_ux110.h @@ -20,7 +20,6 @@ #define AFS_HPUX102_ENV 1 #define AFS_HPUX110_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #include @@ -123,7 +122,6 @@ struct uio; #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ #define AFS_ENV 1 #define AFS_USR_HPUX_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #include diff --git a/src/config/param.hp_ux1123.h b/src/config/param.hp_ux1123.h index 3b07114..fd5246c 100644 --- a/src/config/param.hp_ux1123.h +++ b/src/config/param.hp_ux1123.h @@ -20,7 +20,6 @@ #define AFS_HPUX1122_ENV 1 #define AFS_HPUX1123_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #if defined(__LP64__) #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h index 799a4e72..074db76 100644 --- a/src/config/param.hp_ux11i.h +++ b/src/config/param.hp_ux11i.h @@ -21,7 +21,6 @@ #define AFS_HPUX110_ENV 1 #define AFS_HPUX1111_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #define AFS_64BITUSERPOINTER_ENV 1 @@ -127,7 +126,6 @@ struct uio; #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ #define AFS_ENV 1 #define AFS_USR_HPUX_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #include diff --git a/src/config/param.i386_dfbsd_23.h b/src/config/param.i386_dfbsd_23.h index dd8283a..cc2d323 100644 --- a/src/config/param.i386_dfbsd_23.h +++ b/src/config/param.i386_dfbsd_23.h @@ -23,7 +23,6 @@ #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_DFBSD_ENV 1 @@ -137,7 +136,6 @@ 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_50.h b/src/config/param.i386_fbsd_50.h index 51af23c..227a736 100644 --- a/src/config/param.i386_fbsd_50.h +++ b/src/config/param.i386_fbsd_50.h @@ -12,7 +12,6 @@ #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 @@ -137,7 +136,6 @@ 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 */ #include diff --git a/src/config/param.i386_fbsd_51.h b/src/config/param.i386_fbsd_51.h index 5eceb7d..516d2b1 100644 --- a/src/config/param.i386_fbsd_51.h +++ b/src/config/param.i386_fbsd_51.h @@ -12,7 +12,6 @@ #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 @@ -139,7 +138,6 @@ 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 */ #include diff --git a/src/config/param.i386_fbsd_52.h b/src/config/param.i386_fbsd_52.h index 44e6c7b..a9183bd 100644 --- a/src/config/param.i386_fbsd_52.h +++ b/src/config/param.i386_fbsd_52.h @@ -12,7 +12,6 @@ #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 @@ -141,7 +140,6 @@ 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 */ #include diff --git a/src/config/param.i386_fbsd_53.h b/src/config/param.i386_fbsd_53.h index 7f62aeb..3e229e2 100644 --- a/src/config/param.i386_fbsd_53.h +++ b/src/config/param.i386_fbsd_53.h @@ -12,7 +12,6 @@ #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 @@ -137,7 +136,6 @@ 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_60.h b/src/config/param.i386_fbsd_60.h index afa8810..3f91609 100644 --- a/src/config/param.i386_fbsd_60.h +++ b/src/config/param.i386_fbsd_60.h @@ -12,7 +12,6 @@ #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 @@ -139,7 +138,6 @@ 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_61.h b/src/config/param.i386_fbsd_61.h index ba8a3e3..6a8e364 100644 --- a/src/config/param.i386_fbsd_61.h +++ b/src/config/param.i386_fbsd_61.h @@ -21,7 +21,6 @@ #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 @@ -142,7 +141,6 @@ 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_62.h b/src/config/param.i386_fbsd_62.h index 24090e1..ec36e35 100644 --- a/src/config/param.i386_fbsd_62.h +++ b/src/config/param.i386_fbsd_62.h @@ -22,7 +22,6 @@ #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 @@ -147,7 +146,6 @@ 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_70.h b/src/config/param.i386_fbsd_70.h index ba22cf4..8300ee6 100644 --- a/src/config/param.i386_fbsd_70.h +++ b/src/config/param.i386_fbsd_70.h @@ -22,7 +22,6 @@ #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 @@ -149,7 +148,6 @@ 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_71.h b/src/config/param.i386_fbsd_71.h index 664d70a..b434f3e 100644 --- a/src/config/param.i386_fbsd_71.h +++ b/src/config/param.i386_fbsd_71.h @@ -23,7 +23,6 @@ #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 @@ -153,7 +152,6 @@ 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_80.h b/src/config/param.i386_fbsd_80.h index 8128275..f4e95d3 100644 --- a/src/config/param.i386_fbsd_80.h +++ b/src/config/param.i386_fbsd_80.h @@ -23,7 +23,6 @@ #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 @@ -156,7 +155,6 @@ 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_81.h b/src/config/param.i386_fbsd_81.h index b2469a7..78559e3 100644 --- a/src/config/param.i386_fbsd_81.h +++ b/src/config/param.i386_fbsd_81.h @@ -23,7 +23,6 @@ #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 @@ -159,7 +158,6 @@ 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_90.h b/src/config/param.i386_fbsd_90.h index 46fd404..6647fb7 100644 --- a/src/config/param.i386_fbsd_90.h +++ b/src/config/param.i386_fbsd_90.h @@ -23,7 +23,6 @@ #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 @@ -162,7 +161,6 @@ 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_obsd47.h b/src/config/param.i386_obsd47.h index e224a5d..922aac7 100644 --- a/src/config/param.i386_obsd47.h +++ b/src/config/param.i386_obsd47.h @@ -16,7 +16,6 @@ #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_OBSD_ENV 1 diff --git a/src/config/param.ia64_hpux1122.h b/src/config/param.ia64_hpux1122.h index 92fee40..82435e8 100644 --- a/src/config/param.ia64_hpux1122.h +++ b/src/config/param.ia64_hpux1122.h @@ -21,7 +21,6 @@ #define AFS_HPUX1111_ENV 1 #define AFS_HPUX1122_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #if defined(__LP64__) #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ diff --git a/src/config/param.ia64_hpux1123.h b/src/config/param.ia64_hpux1123.h index d4f5dad..00b513f 100644 --- a/src/config/param.ia64_hpux1123.h +++ b/src/config/param.ia64_hpux1123.h @@ -22,7 +22,6 @@ #define AFS_HPUX1122_ENV 1 #define AFS_HPUX1123_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #if defined(__LP64__) #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ diff --git a/src/config/param.linux22.h b/src/config/param.linux22.h index 9260980..c6f0e61 100644 --- a/src/config/param.linux22.h +++ b/src/config/param.linux22.h @@ -19,7 +19,6 @@ #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 diff --git a/src/config/param.linux24.h b/src/config/param.linux24.h index 7ee9566..3c2afa5 100644 --- a/src/config/param.linux24.h +++ b/src/config/param.linux24.h @@ -20,7 +20,6 @@ #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 @@ -87,7 +86,6 @@ #define AFS_NONFSTRANS 1 #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_64BIT_IOPS_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_USERSPACE_IP_ADDR 1 #define RXK_LISTENER_ENV 1 diff --git a/src/config/param.linux26.h b/src/config/param.linux26.h index 0feafa6..48e4b87 100644 --- a/src/config/param.linux26.h +++ b/src/config/param.linux26.h @@ -21,7 +21,6 @@ #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 @@ -68,7 +67,6 @@ #define AFS_NONFSTRANS 1 #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_64BIT_IOPS_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_USERSPACE_IP_ADDR 1 #define RXK_LISTENER_ENV 1 diff --git a/src/config/param.nbsd20.h b/src/config/param.nbsd20.h index 4eb461d..f854c78 100644 --- a/src/config/param.nbsd20.h +++ b/src/config/param.nbsd20.h @@ -3,7 +3,6 @@ #ifndef AFS_PARAM_COMMON_H #define AFS_PARAM_COMMON_H 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.nbsd21.h b/src/config/param.nbsd21.h index 6896759..1f060b6 100644 --- a/src/config/param.nbsd21.h +++ b/src/config/param.nbsd21.h @@ -3,7 +3,6 @@ #ifndef AFS_PARAM_COMMON_H #define AFS_PARAM_COMMON_H 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.nbsd30.h b/src/config/param.nbsd30.h index a83d83a..b5d4c29 100644 --- a/src/config/param.nbsd30.h +++ b/src/config/param.nbsd30.h @@ -3,7 +3,6 @@ #ifndef AFS_PARAM_COMMON_H #define AFS_PARAM_COMMON_H 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.nbsd40.h b/src/config/param.nbsd40.h index 91bae65..fc2c829 100644 --- a/src/config/param.nbsd40.h +++ b/src/config/param.nbsd40.h @@ -3,7 +3,6 @@ #ifndef AFS_PARAM_COMMON_H #define AFS_PARAM_COMMON_H 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.nbsd50.h b/src/config/param.nbsd50.h index 59458b8..f37b712 100644 --- a/src/config/param.nbsd50.h +++ b/src/config/param.nbsd50.h @@ -3,7 +3,6 @@ #ifndef AFS_PARAM_COMMON_H #define AFS_PARAM_COMMON_H 1 -#define AFS_64BIT_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.obsd31.h b/src/config/param.obsd31.h index cd51007..b59d65f 100644 --- a/src/config/param.obsd31.h +++ b/src/config/param.obsd31.h @@ -15,7 +15,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd32.h b/src/config/param.obsd32.h index f2cc01c..d21d9ed 100644 --- a/src/config/param.obsd32.h +++ b/src/config/param.obsd32.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd33.h b/src/config/param.obsd33.h index 52ed206..28077a0 100644 --- a/src/config/param.obsd33.h +++ b/src/config/param.obsd33.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd34.h b/src/config/param.obsd34.h index 4422de2..e8bb1a0 100644 --- a/src/config/param.obsd34.h +++ b/src/config/param.obsd34.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd35.h b/src/config/param.obsd35.h index 311785a..65f7a08 100644 --- a/src/config/param.obsd35.h +++ b/src/config/param.obsd35.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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_OBSD_ENV 1 diff --git a/src/config/param.obsd36.h b/src/config/param.obsd36.h index a3b309e..ca1c221 100644 --- a/src/config/param.obsd36.h +++ b/src/config/param.obsd36.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd37.h b/src/config/param.obsd37.h index d382c60..080a88d 100644 --- a/src/config/param.obsd37.h +++ b/src/config/param.obsd37.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd38.h b/src/config/param.obsd38.h index 081f778..c96c98f 100644 --- a/src/config/param.obsd38.h +++ b/src/config/param.obsd38.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd39.h b/src/config/param.obsd39.h index 1d20f42..bcd18f0 100644 --- a/src/config/param.obsd39.h +++ b/src/config/param.obsd39.h @@ -16,7 +16,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd40.h b/src/config/param.obsd40.h index 0e0e0e7..ec61890 100644 --- a/src/config/param.obsd40.h +++ b/src/config/param.obsd40.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd41.h b/src/config/param.obsd41.h index 2a58ab2..405431f 100644 --- a/src/config/param.obsd41.h +++ b/src/config/param.obsd41.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd42.h b/src/config/param.obsd42.h index 50ddaf9..698b512 100644 --- a/src/config/param.obsd42.h +++ b/src/config/param.obsd42.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd43.h b/src/config/param.obsd43.h index a792d03..e55e9f1 100644 --- a/src/config/param.obsd43.h +++ b/src/config/param.obsd43.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd44.h b/src/config/param.obsd44.h index 6f87cf3..c4f39d1 100644 --- a/src/config/param.obsd44.h +++ b/src/config/param.obsd44.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd45.h b/src/config/param.obsd45.h index c4758ac..d794887 100644 --- a/src/config/param.obsd45.h +++ b/src/config/param.obsd45.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.obsd46.h b/src/config/param.obsd46.h index c77f51a..def8afb 100644 --- a/src/config/param.obsd46.h +++ b/src/config/param.obsd46.h @@ -13,7 +13,6 @@ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #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 */ diff --git a/src/config/param.ppc_darwin_70.h b/src/config/param.ppc_darwin_70.h index f937ebd..e72b317 100644 --- a/src/config/param.ppc_darwin_70.h +++ b/src/config/param.ppc_darwin_70.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_PPC_ENV 1 #define AFS_VFSINCL_ENV 1 @@ -80,7 +79,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_PPC_ENV 1 #include diff --git a/src/config/param.ppc_darwin_80.h b/src/config/param.ppc_darwin_80.h index aae31d8..f4ab2f6 100644 --- a/src/config/param.ppc_darwin_80.h +++ b/src/config/param.ppc_darwin_80.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -102,7 +101,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) diff --git a/src/config/param.ppc_darwin_90.h b/src/config/param.ppc_darwin_90.h index 1dc8e42..12b18e1 100644 --- a/src/config/param.ppc_darwin_90.h +++ b/src/config/param.ppc_darwin_90.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -104,7 +103,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h index e0b3cca..dedeeb4 100644 --- a/src/config/param.rs_aix42.h +++ b/src/config/param.rs_aix42.h @@ -18,7 +18,6 @@ #define AFS_AIX41_ENV 1 #define AFS_AIX42_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #ifdef AFS_NAMEI_ENV @@ -96,7 +95,6 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_VFS_ENV 1 diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h index f902569..10109ac 100644 --- a/src/config/param.rs_aix51.h +++ b/src/config/param.rs_aix51.h @@ -19,7 +19,6 @@ #define AFS_AIX42_ENV 1 #define AFS_AIX51_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV @@ -97,7 +96,6 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV diff --git a/src/config/param.rs_aix52.h b/src/config/param.rs_aix52.h index 64af9ce..f44cc4d 100644 --- a/src/config/param.rs_aix52.h +++ b/src/config/param.rs_aix52.h @@ -20,7 +20,6 @@ #define AFS_AIX51_ENV 1 #define AFS_AIX52_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV @@ -98,7 +97,6 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV diff --git a/src/config/param.rs_aix53.h b/src/config/param.rs_aix53.h index a155172..70897ad 100644 --- a/src/config/param.rs_aix53.h +++ b/src/config/param.rs_aix53.h @@ -21,7 +21,6 @@ #define AFS_AIX52_ENV 1 #define AFS_AIX53_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV @@ -99,7 +98,6 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV diff --git a/src/config/param.rs_aix61.h b/src/config/param.rs_aix61.h index 8ddeea9..24f74fe 100644 --- a/src/config/param.rs_aix61.h +++ b/src/config/param.rs_aix61.h @@ -22,7 +22,6 @@ #define AFS_AIX53_ENV 1 #define AFS_AIX61_ENV 1 -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV @@ -100,7 +99,6 @@ #ifndef AFS_PARAM_H #define AFS_PARAM_H -#define AFS_64BIT_ENV 1 #define AFS_64BIT_CLIENT 1 #define AFS_NAMEI_ENV 1 #ifdef AFS_NAMEI_ENV diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h index aff86cd..389bc8f 100644 --- a/src/config/param.sgi_65.h +++ b/src/config/param.sgi_65.h @@ -37,7 +37,6 @@ #define _ANSI_C_SOURCE 1 /* rx_user.h */ -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #define AFS_64BITUSERPOINTER_ENV 1 @@ -177,8 +176,6 @@ #define AFS_HAVE_FFS 1 /* Use system's ffs. */ #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ - #include /* Extra kernel definitions (from kdefs file) */ diff --git a/src/config/param.sun4x_510.h b/src/config/param.sun4x_510.h index 03c4b40..7f7b5f6 100644 --- a/src/config/param.sun4x_510.h +++ b/src/config/param.sun4x_510.h @@ -23,7 +23,6 @@ #define AFS_SUN510_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -88,7 +87,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__sparcv9) #define AFS_SUN57_64BIT_ENV 1 @@ -130,8 +128,6 @@ #define AFS_USR_SUN8_ENV 1 #define AFS_USR_SUN9_ENV 1 -#define AFS_64BIT_ENV 1 - #include #if 0 diff --git a/src/config/param.sun4x_511.h b/src/config/param.sun4x_511.h index b36c5cf..5b999c9 100644 --- a/src/config/param.sun4x_511.h +++ b/src/config/param.sun4x_511.h @@ -24,7 +24,6 @@ #define AFS_SUN511_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -89,7 +88,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__sparcv9) #define AFS_SUN57_64BIT_ENV 1 @@ -131,7 +129,6 @@ #define AFS_USR_SUN8_ENV 1 #define AFS_USR_SUN9_ENV 1 -#define AFS_64BIT_ENV 1 #include diff --git a/src/config/param.sun4x_56.h b/src/config/param.sun4x_56.h index 3ec069d..3514fc2 100644 --- a/src/config/param.sun4x_56.h +++ b/src/config/param.sun4x_56.h @@ -31,7 +31,6 @@ #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ diff --git a/src/config/param.sun4x_57.h b/src/config/param.sun4x_57.h index a4fe3e6..7aaf4a8 100644 --- a/src/config/param.sun4x_57.h +++ b/src/config/param.sun4x_57.h @@ -29,7 +29,6 @@ #define AFS_SUN57_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -86,7 +85,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__sparcv9) #define AFS_SUN57_64BIT_ENV 1 diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h index 9ca443a..b1a79fc 100644 --- a/src/config/param.sun4x_58.h +++ b/src/config/param.sun4x_58.h @@ -21,7 +21,6 @@ #define AFS_SUN58_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -84,7 +83,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__sparcv9) #define AFS_SUN57_64BIT_ENV 1 @@ -128,8 +126,6 @@ #define AFS_USR_SUN7_ENV 1 #define AFS_USR_SUN8_ENV 1 -#define AFS_64BIT_ENV 1 - #include #if 0 diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h index 934afef..945f296 100644 --- a/src/config/param.sun4x_59.h +++ b/src/config/param.sun4x_59.h @@ -22,7 +22,6 @@ #define AFS_SUN59_ENV 1 #define AFS_BOZONLOCK_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -85,7 +84,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__sparcv9) #define AFS_SUN57_64BIT_ENV 1 @@ -130,8 +128,6 @@ #define AFS_USR_SUN8_ENV 1 #define AFS_USR_SUN9_ENV 1 -#define AFS_64BIT_ENV 1 - #include #if 0 diff --git a/src/config/param.sunx86_510.h b/src/config/param.sunx86_510.h index 652b183..fa2d1fd 100644 --- a/src/config/param.sunx86_510.h +++ b/src/config/param.sunx86_510.h @@ -33,7 +33,6 @@ #define AFS_BOZONLOCK_ENV 1 #define AFS_X86_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -98,7 +97,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__amd64) #define AFS_SUN57_64BIT_ENV 1 @@ -140,8 +138,6 @@ #define AFS_USR_SUN8_ENV 1 #define AFS_USR_SUN9_ENV 1 -#define AFS_64BIT_ENV 1 - #include #if 0 diff --git a/src/config/param.sunx86_511.h b/src/config/param.sunx86_511.h index 6ea57e2..fef6672 100644 --- a/src/config/param.sunx86_511.h +++ b/src/config/param.sunx86_511.h @@ -34,7 +34,6 @@ #define AFS_BOZONLOCK_ENV 1 #define AFS_X86_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 @@ -99,7 +98,6 @@ /** * These defines are for the 64 bit Solaris 7 port * AFS_SYSCALL32 is used to protect the ILP32 syscall interface - * AFS_64BIT_ENV is for use of 64 bit inode numbers */ #if defined(__amd64) #define AFS_SUN57_64BIT_ENV 1 @@ -141,8 +139,6 @@ #define AFS_USR_SUN8_ENV 1 #define AFS_USR_SUN9_ENV 1 -#define AFS_64BIT_ENV 1 - #include #if 0 diff --git a/src/config/param.sunx86_57.h b/src/config/param.sunx86_57.h index 2bbfa35..a48daf5 100644 --- a/src/config/param.sunx86_57.h +++ b/src/config/param.sunx86_57.h @@ -31,7 +31,6 @@ #define AFS_X86_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h index 69a2bb9..abb6b84 100644 --- a/src/config/param.sunx86_58.h +++ b/src/config/param.sunx86_58.h @@ -32,7 +32,6 @@ #define AFS_X86_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 diff --git a/src/config/param.sunx86_59.h b/src/config/param.sunx86_59.h index 4954f05..2a6df80 100644 --- a/src/config/param.sunx86_59.h +++ b/src/config/param.sunx86_59.h @@ -33,7 +33,6 @@ #define AFS_X86_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_HAVE_FLOCK_SYSID 1 diff --git a/src/config/param.x86_darwin_100.h b/src/config/param.x86_darwin_100.h index 1b7cc19..2275b0b 100644 --- a/src/config/param.x86_darwin_100.h +++ b/src/config/param.x86_darwin_100.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -137,7 +136,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) || defined(__amd64__) diff --git a/src/config/param.x86_darwin_80.h b/src/config/param.x86_darwin_80.h index 058b9bf..f2fa162 100644 --- a/src/config/param.x86_darwin_80.h +++ b/src/config/param.x86_darwin_80.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -100,7 +99,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h index 8f12926..b7ec741 100644 --- a/src/config/param.x86_darwin_90.h +++ b/src/config/param.x86_darwin_90.h @@ -5,7 +5,6 @@ #define AFS_PARAM_H #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #define AFS_64BIT_CLIENT 1 #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) @@ -103,7 +102,6 @@ #define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */ #define AFS_ENV 1 -#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 #elif defined(__i386__) || defined(__x86_64__) diff --git a/src/config/stds.h b/src/config/stds.h index be6d833..1142050 100644 --- a/src/config/stds.h +++ b/src/config/stds.h @@ -59,7 +59,6 @@ pragma Off(Prototype_override_warnings); typedef short afs_int16; typedef unsigned short afs_uint16; -#ifdef AFS_64BIT_ENV typedef int afs_int32; typedef unsigned int afs_uint32; #if defined(AFS_NT40_ENV) && defined(_MSC_VER) @@ -91,46 +90,6 @@ typedef unsigned long long afs_uint64; #define SplitInt64(t,h,l) (h) = ((afs_int64)t) >> 32; (l) = (t) & MAX_AFS_UINT32; #define RoundInt64ToInt32(a) (a > MAX_AFS_UINT32) ? MAX_AFS_UINT32 : a; #define RoundInt64ToInt31(a) (a > MAX_AFS_INT32) ? MAX_AFS_INT32 : a; -#else /* AFS_64BIT_ENV */ -typedef long afs_int32; -typedef unsigned long afs_uint32; - -struct Int64 { - afs_int32 high; - afs_uint32 low; -}; -typedef struct Int64 afs_int64; - -struct u_Int64 { - afs_uint32 high; - afs_uint32 low; -}; -typedef struct u_Int64 afs_uint64; -#define ZeroInt64(a) ((a).high = (a).low = 0) -#define AssignInt64(a, b) (b)->high = (a).high; (b)->low = (a).low -#define IncInt64(a) ((++((a)->low)) ? 0 : (a)->high++ ) -#define IncUInt64(a) ((++((a)->low)) ? 0 : (a)->high++ ) -#define DecInt64(a) (((a)->low)-- ? 0 : (a)->high-- ) -#define DecUInt64(a) (((a)->low)-- ? 0 : (a)->high-- ) -#define GTInt64(a,b) (((a).high > (b).high) || (((a).high == (b).high) && ((a).low > (b).low))) -#define GEInt64(a,b) (((a).high > (b).high) || (((a).high == (b).high) && ((a).low >= (b).low))) -#define LEInt64(a,b) (((a).high < (b).high) || (((a).high == (b).high) && ((a).low <= (b).low))) -#define LTInt64(a,b) (((a).high < (b).high) || (((a).high == (b).high) && ((a).low < (b).low))) -#define CompareInt64(a,b) (((afs_int32)(a).high - (afs_int32)(b).high) || (((a).high == (b).high) && ((a).low - (b).low))) -#define AddInt64(a, b, c) { afs_int64 _a, _b; _a = a; _b = b; (c)->low = _a.low + _b.low; (c)->high = _a.high + _b.high + ((c)->low < _b.low); } -#define SubtractInt64(a, b, c) { afs_int64 _a, _b; _a = a; _b = b; (c)->low = _a.low - _b.low; (c)->high = _a.high - _b.high - (_a.low < _b.low); } -#define CompareUInt64(a,b) (((afs_uint32)(a).high - (afs_uint32)(b).high) || (((a).high == (b).high) && ((a).low - (b).low))) -#define AddUInt64(a, b, c) { afs_uint64 _a, _b; _a = a; _b = b; (c)->low = _a.low + _b.low; (c)->high = _a.high + _b.high + ((c)->low < _b.low); } -#define SubtractUInt64(a, b, c) { afs_uint64 _a, _b; _a = a; _b = b; (c)->low = _a.low - _b.low; (c)->high = _a.high - _b.high - (_a.low < _b.low); } -#define NonZeroInt64(a) (a).low || (a).high -#define Int64ToInt32(a) (a).low -#define FillInt64(t,h,l) (t).high = (h); (t).low = (l); -#define SplitInt64(t,h,l) (h) = (t).high; (l) = (t).low; -#define RoundInt64ToInt32(a) (a.high > 0) ? MAX_AFS_UINT32 : a.low; -#define RoundInt64ToInt31(a) (a.high > 0) ? MAX_AFS_INT32 : a.low; -#endif /* AFS_64BIT_ENV */ - -/* AFS_64BIT_CLIENT should presently be set only for AFS_64BIT_ENV systems */ #ifdef AFS_64BIT_CLIENT typedef afs_int64 afs_size_t; @@ -167,7 +126,7 @@ typedef afs_uint32 afs_uintmax_t; * some assistence in this matter. The hyper type is supposed to be compatible * with the afsHyper type: the same macros will work on both. */ -#if defined(AFS_64BIT_ENV) && 0 +#if 0 typedef unsigned long afs_hyper_t; @@ -189,7 +148,7 @@ typedef unsigned long afs_hyper_t; #define hadd32(a,b) ((a) += (b)) #define hshlft(a,n) ((a)<<(n)) -#else /* AFS_64BIT_ENV */ +#else /* 0*/ typedef struct afs_hyper_t { /* unsigned 64 bit integers */ unsigned int high; @@ -238,7 +197,7 @@ typedef struct afs_hyper_t { /* unsigned 64 bit integers */ (a).low += (int)(i)) #define hadd(a,b) (hadd32(a,(b).low), (a).high += (b).high) -#endif /* AFS_64BIT_ENV */ +#endif /* 0 */ #if !defined(KERNEL) || defined(UKERNEL) #ifndef AFS_NT40_ENV diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c index fcca3c6..bf1a571 100644 --- a/src/rx/xdr_int64.c +++ b/src/rx/xdr_int64.c @@ -19,7 +19,6 @@ #endif #include "xdr.h" -#ifdef AFS_64BIT_ENV /* * XDR afs_int64 integers */ @@ -94,58 +93,3 @@ xdr_afs_uint64(XDR * xdrs, afs_uint64 * ulp) return (FALSE); } -#else /* AFS_64BIT_ENV */ -/* - * XDR afs_int64 integers - */ -bool_t -xdr_int64(XDR * xdrs, afs_int64 * ulp) -{ - return xdr_afs_int64(xdrs, ulp); -} - -bool_t -xdr_afs_int64(XDR * xdrs, afs_int64 * ulp) -{ - if (xdrs->x_op == XDR_DECODE) { - if (!XDR_GETINT32(xdrs, (afs_int32 *) & ulp->high)) - return (FALSE); - return (XDR_GETINT32(xdrs, (afs_int32 *) & ulp->low)); - } - if (xdrs->x_op == XDR_ENCODE) { - if (!XDR_PUTINT32(xdrs, (afs_int32 *) & ulp->high)) - return (FALSE); - return (XDR_PUTINT32(xdrs, (afs_int32 *) & ulp->low)); - } - if (xdrs->x_op == XDR_FREE) - return (TRUE); - return (FALSE); -} - -/* - * XDR afs_uint64 integers - */ -bool_t -xdr_uint64(XDR * xdrs, afs_uint64 * ulp) -{ - return xdr_afs_uint64(xdrs, ulp); -} - -bool_t -xdr_afs_uint64(XDR * xdrs, afs_uint64 * ulp) -{ - if (xdrs->x_op == XDR_DECODE) { - if (!XDR_GETINT32(xdrs, (afs_uint32 *) & ulp->high)) - return (FALSE); - return (XDR_GETINT32(xdrs, (afs_uint32 *) & ulp->low)); - } - if (xdrs->x_op == XDR_ENCODE) { - if (!XDR_PUTINT32(xdrs, (afs_uint32 *) & ulp->high)) - return (FALSE); - return (XDR_PUTINT32(xdrs, (afs_uint32 *) & ulp->low)); - } - if (xdrs->x_op == XDR_FREE) - return (TRUE); - return (FALSE); -} -#endif /* AFS_64BIT_ENV */ diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c index 3318cb1..4979f36 100644 --- a/src/rxkad/bg-fcrypt.c +++ b/src/rxkad/bg-fcrypt.c @@ -546,7 +546,6 @@ fc_keysched(void *key_, fc_KeySchedule sched) const unsigned char *key = key_; /* Do we have 56 bit longs or even longer longs? */ -#ifdef AFS_64BIT_ENV afs_uint64 k; /* k holds all 56 non parity bits */ /* Compress out parity bits */ @@ -601,64 +600,7 @@ fc_keysched(void *key_, fc_KeySchedule sched) *sched++ = EFF_NTOHL((afs_uint32) k); ROT56R64(k, 11); *sched++ = EFF_NTOHL((afs_uint32) k); -#else - afs_uint32 hi, lo; /* hi is upper 24 bits and lo lower 32, total 56 */ - - /* Compress out parity bits */ - lo = (*key++) >> 1; - lo <<= 7; - lo |= (*key++) >> 1; - lo <<= 7; - lo |= (*key++) >> 1; - lo <<= 7; - lo |= (*key++) >> 1; - hi = lo >> 4; - lo &= 0xf; - lo <<= 7; - lo |= (*key++) >> 1; - lo <<= 7; - lo |= (*key++) >> 1; - lo <<= 7; - lo |= (*key++) >> 1; - lo <<= 7; - lo |= (*key) >> 1; - /* Use lower 32 bits for schedule, rotate by 11 each round (16 times) */ - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); - ROT56R(hi, lo, 11); - *sched++ = EFF_NTOHL(lo); -#endif INC_RXKAD_STATS(fc_key_scheds); return 0; } diff --git a/src/sys/afssyscalls.h b/src/sys/afssyscalls.h index 6956716..cd014d8 100644 --- a/src/sys/afssyscalls.h +++ b/src/sys/afssyscalls.h @@ -16,22 +16,16 @@ #include #ifdef AFS_NAMEI_ENV #include -#if AFS_64BIT_ENV + typedef afs_uint64 Inode; -#else -typedef u_int64_t Inode; -#endif + #else /* AFS_NAMEI_ENV */ #ifdef AFS_64BIT_IOPS_ENV #ifdef AFS_SGI62_ENV typedef uint64_t Inode; #else #include -#if AFS_64BIT_ENV typedef afs_uint64 Inode; -#else -error Need 64 bit Inode defined. -#endif #endif /* AFS_SGI62_ENV */ #else /* AFS_64BIT_IOPS_ENV */ typedef unsigned int Inode; diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c index a27cbda..e1b38be 100644 --- a/src/tviced/serialize_state.c +++ b/src/tviced/serialize_state.c @@ -936,19 +936,10 @@ fs_stateSeek(struct fs_dump_state * state, afs_uint64 * offset) { int ret = 0; char * p; -#ifndef AFS_64BIT_ENV - afs_uint32 hi, lo; - - SplitInt64(*offset, hi, lo); -#endif /* update cursor */ p = (char *) state->mmap.map; -#ifdef AFS_64BIT_ENV p += *offset; -#else - p += lo; -#endif state->mmap.cursor = (void *) p; /* update offset */ diff --git a/src/usd/usd_nt.c b/src/usd/usd_nt.c index b672d04..df5fff2 100644 --- a/src/usd/usd_nt.c +++ b/src/usd/usd_nt.c @@ -138,7 +138,6 @@ usd_DeviceSeek(usd_handle_t usd, afs_hyper_t reqOff, int whence, DWORDLONG k = (DWORDLONG) ((afs_uint32) usd->privateData); - /* _ASSERT(AFS_64BIT_ENV); */ if (offset >= (k << 10)) return EINVAL; } diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index 17fbde0..d4da7cc 100644 --- a/src/util/afsutil_prototypes.h +++ b/src/util/afsutil_prototypes.h @@ -76,15 +76,9 @@ extern int base32_to_int(char *s); /* base 64 converters for namei interface. Flip bits to differences are * early in name. */ -#ifdef AFS_64BIT_ENV #define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (afs_uint64)(A)) extern char *int64_to_flipbase64(lb64_string_t s, afs_uint64 a); extern afs_int64 flipbase64_to_int64(char *s); -#else -#define int32_to_flipbase64(S, A) int64_to_flipbase64(S, (u_int64_t)(A)) -extern char *int64_to_flipbase64(lb64_string_t s, u_int64_t a); -extern int64_t flipbase64_to_int64(char *s); -#endif #endif /* get_krbrlm.c */ diff --git a/src/util/flipbase64.c b/src/util/flipbase64.c index ebed8e9..ef1c6c9 100644 --- a/src/util/flipbase64.c +++ b/src/util/flipbase64.c @@ -76,20 +76,11 @@ static char c_reverse[] = { * The supplied string 's' must be at least 12 bytes long. * lb64_string in stds.h provides a typedef to get the length. */ -#ifdef AFS_64BIT_ENV char * int64_to_flipbase64(lb64_string_t s, afs_uint64 a) -#else -char * -int64_to_flipbase64(lb64_string_t s, u_int64_t a) -#endif { int i; -#ifdef AFS_64BIT_ENV afs_uint64 n; -#else - u_int64_t n; -#endif i = 0; if (a == 0) @@ -104,21 +95,11 @@ int64_to_flipbase64(lb64_string_t s, u_int64_t a) } -#ifdef AFS_64BIT_ENV afs_int64 flipbase64_to_int64(char *s) -#else -int64_t -flipbase64_to_int64(char *s) -#endif { -#ifdef AFS_64BIT_ENV afs_int64 n = 0; afs_int64 result = 0; -#else - int64_t n = 0; - int64_t result = 0; -#endif int shift; for (shift = 0; *s; s++) { diff --git a/src/util/snprintf.c b/src/util/snprintf.c index 5b0b2ad..d0c61f2 100644 --- a/src/util/snprintf.c +++ b/src/util/snprintf.c @@ -206,16 +206,6 @@ as_append_char (struct snprintf_state *state, unsigned char c) *state->s++ = c; } -/* longest integer types */ - -#ifdef AFS_64BIT_ENV -typedef afs_uint64 u_longest; -typedef afs_int64 longest; -#else -typedef afs_uint32 u_longest; -typedef afs_int32 longest; -#endif - static int pad(struct snprintf_state *state, int width, char c) { @@ -229,18 +219,18 @@ pad(struct snprintf_state *state, int width, char c) /* return true if we should use alternatve hex form */ static int -use_alternative (int flags, u_longest num, unsigned base) +use_alternative (int flags, afs_uint64 num, unsigned base) { return (flags & alternate_flag) && base == 16 && num != 0; } static int append_number(struct snprintf_state *state, - u_longest num, unsigned base, const char *rep, + afs_uint64 num, unsigned base, const char *rep, int width, int prec, int flags, int minusp) { int len = 0; - u_longest n = num; + afs_uint64 n = num; char nstr[MAXPREC]; /* enough for <192 bit octal integers */ int nstart, nlen; char signchar; @@ -496,7 +486,6 @@ append_address(struct snprintf_state *state, * This can't be made into a function... */ -#if defined(AFS_64BIT_ENV) #if defined(AFS_NT40_ENV) #define PARSE_INT_FORMAT(res, arg, unsig) \ @@ -526,19 +515,6 @@ else \ res = (unsig int)va_arg(arg, unsig int) #endif -#else - -#define PARSE_INT_FORMAT(res, arg, unsig) \ -if (long_flag || addr_flag) \ - res = (afs_uint32)va_arg(arg, afs_uint32); \ -else if (size_t_flag) \ - res = (size_t)va_arg(arg, size_t); \ -else if (short_flag) \ - res = (unsig short)va_arg(arg, unsig int); \ -else \ - res = (unsig int)va_arg(arg, unsig int) - -#endif /* * zyxprintf - return length, as snprintf @@ -678,8 +654,8 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; case 'd' : case 'i' : { - longest arg; - u_longest num; + afs_int64 arg; + afs_uint64 num; int minusp = 0; PARSE_INT_FORMAT(arg, ap, signed); @@ -695,7 +671,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; } case 'u' : { - u_longest arg; + afs_uint64 arg; PARSE_INT_FORMAT(arg, ap, unsigned); @@ -704,7 +680,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; } case 'o' : { - u_longest arg; + afs_uint64 arg; PARSE_INT_FORMAT(arg, ap, unsigned); @@ -713,7 +689,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; } case 'x' : { - u_longest arg; + afs_uint64 arg; PARSE_INT_FORMAT(arg, ap, unsigned); @@ -722,7 +698,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; } case 'X' :{ - u_longest arg; + afs_uint64 arg; PARSE_INT_FORMAT(arg, ap, unsigned); @@ -732,9 +708,9 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) } case 'p' : { #ifdef AFS_64BITUSERPOINTER_ENV - u_longest arg = (u_longest)va_arg(ap, void*); + afs_uint64 arg = (afs_uint64)va_arg(ap, void*); #else - u_longest arg = (unsigned long)va_arg(ap, void*); + afs_uint64 arg = (unsigned long)va_arg(ap, void*); #endif len += append_number (state, arg, 0x10, "0123456789ABCDEF", width, prec, flags, 0); @@ -746,7 +722,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; } case 'I' : { - u_longest arg; + afs_uint64 arg; PARSE_INT_FORMAT(arg, ap, unsigned); diff --git a/src/util/test/snprintf_test.c b/src/util/test/snprintf_test.c index 0b82e55..753f341 100644 --- a/src/util/test/snprintf_test.c +++ b/src/util/test/snprintf_test.c @@ -167,7 +167,7 @@ cmp_with_sprintf_long_long (void) #endif -#if defined(AFS_64BIT_ENV) && defined(AFS_NT40_ENV) +#if defined(AFS_NT40_ENV) static int cmp_with_sprintf_I64 (void) @@ -390,7 +390,7 @@ main (int argc, char **argv) #ifdef HAVE_LONG_LONG ret += cmp_with_sprintf_long_long (); #endif -#if defined(AFS_64BIT_ENV) && defined(AFS_NT40_ENV) +#if defined(AFS_NT40_ENV) ret += cmp_with_sprintf_I64 (); #endif ret += cmp_with_sprintf_float (); diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index dcc861d..97114b9 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -398,7 +398,6 @@ PrintCacheEntries64(struct rx_connection *aconn, int aint32) PrintLock(¢ry.lock); printf("\n"); } -#ifdef AFS_64BIT_ENV #ifdef AFS_NT40_ENV printf(" %12I64d bytes DV %12d refcnt %5d\n", centry.Length, centry.DataVersion, centry.refCount); @@ -406,10 +405,6 @@ PrintCacheEntries64(struct rx_connection *aconn, int aint32) printf(" %12llu bytes DV %12d refcnt %5d\n", centry.Length, centry.DataVersion, centry.refCount); #endif -#else - printf(" %12d bytes DV %12d refcnt %5d\n", centry.Length, - centry.DataVersion, centry.refCount); -#endif if (print_ctime) { time_t t = centry.cbExpires; printf(" callback %08x\texpires %s\n", centry.callback, diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index b2a134e..6b01518 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -2368,15 +2368,8 @@ SRXAFS_FetchData64(struct rx_call * acall, struct AFSFid * Fid, afs_int64 Pos, int code; afs_sfsize_t tPos, tLen; -#ifdef AFS_64BIT_ENV tPos = (afs_sfsize_t) Pos; tLen = (afs_sfsize_t) Len; -#else /* AFS_64BIT_ENV */ - if (Pos.high || Len.high) - return EFBIG; - tPos = Pos.low; - tLen = Len.low; -#endif /* AFS_64BIT_ENV */ code = common_FetchData64(acall, Fid, tPos, tLen, OutStatus, CallBack, Sync, @@ -3210,17 +3203,9 @@ SRXAFS_StoreData64(struct rx_call * acall, struct AFSFid * Fid, afs_fsize_t tLength; afs_fsize_t tFileLength; -#ifdef AFS_64BIT_ENV tPos = (afs_fsize_t) Pos; tLength = (afs_fsize_t) Length; tFileLength = (afs_fsize_t) FileLength; -#else /* AFS_64BIT_ENV */ - if (FileLength.high) - return EFBIG; - tPos = Pos.low; - tLength = Length.low; - tFileLength = FileLength.low; -#endif /* AFS_64BIT_ENV */ code = common_StoreData64(acall, Fid, InStatus, tPos, tLength, tFileLength, @@ -6335,9 +6320,7 @@ SRXAFS_GetCapabilities(struct rx_call * acall, Capabilities * capabilities) dataBytes = 1 * sizeof(afs_int32); dataBuffP = (afs_uint32 *) malloc(dataBytes); dataBuffP[0] = VICED_CAPABILITY_ERRORTRANS | VICED_CAPABILITY_WRITELOCKACL; -#if defined(AFS_64BIT_ENV) dataBuffP[0] |= VICED_CAPABILITY_64BITFILES; -#endif if (saneacls) dataBuffP[0] |= VICED_CAPABILITY_SANEACLS; diff --git a/src/viced/callback.c b/src/viced/callback.c index 5555391..602d2bb 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -2688,9 +2688,7 @@ ReadDump(char *file, int timebits) int fd, oflag; afs_uint32 magic, freelisthead; afs_uint32 now; -#ifdef AFS_64BIT_ENV afs_int64 now64; -#endif oflag = O_RDONLY; #ifdef AFS_NT40_ENV @@ -2714,13 +2712,12 @@ ReadDump(char *file, int timebits) exit(1); } } -#ifdef AFS_64BIT_ENV if (timebits == 64) { read(fd, &now64, sizeof(afs_int64)); now = (afs_int32) now64; } else -#endif read(fd, &now, sizeof(afs_int32)); + read(fd, &cbstuff, sizeof(cbstuff)); read(fd, TimeOuts, sizeof(TimeOuts)); read(fd, timeout, sizeof(timeout)); @@ -2800,9 +2797,7 @@ main(int argc, char **argv) argc--; timebits = atoi(*++argv); if ((timebits != 32) -#ifdef AFS_64BIT_ENV && (timebits != 64) -#endif ) err++; } else if (!strcmp(*argv, "-volume")) { @@ -2819,9 +2814,7 @@ main(int argc, char **argv) if (err || argc != 1) { fprintf(stderr, "Usage: cbd [-host cbid] [-fid volume vnode] [-stats] [-all] [-timebits 32" -#ifdef AFS_64BIT_ENV "|64" -#endif "] callbackdumpfile\n"); fprintf(stderr, "[cbid is shown for each host in the hosts.dump file]\n"); diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 845d642..2b25dc8 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -1514,7 +1514,6 @@ volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP, int tag, *status = 0; -#ifdef AFS_64BIT_ENV { afs_uint32 filesize_high = 0L, filesize_low = 0L; if (tag == 'h') { @@ -1529,12 +1528,6 @@ volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP, int tag, } FillInt64(filesize, filesize_high, filesize_low); } -#else /* !AFS_64BIT_ENV */ - if (!ReadInt32(iodp, &filesize)) { - *status = 1; - return (0); - } -#endif /* !AFS_64BIT_ENV */ p = (unsigned char *)malloc(size); if (p == NULL) { *status = 2; diff --git a/src/volser/vos.c b/src/volser/vos.c index 6181465..0fbda28 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -5779,11 +5779,7 @@ Sizes(struct cmd_syndesc *as, void *arock) fprintf(STDOUT, "Volume: %s\n", as->parms[0].items->data); if (as->parms[3].items) { /* do the dump estimate */ -#ifdef AFS_64BIT_ENV vol_size.dump_size = 0; -#else - FillInt64(vol_size.dump_size,0, 1); -#endif code = UV_GetSize(avolid, aserver, apart, fromdate, &vol_size); if (code) { PrintDiagnostics("size", code);