From 6329a523f6305541871bc3d1694065e7b17abe77 Mon Sep 17 00:00:00 2001 From: Cheyenne Wills Date: Thu, 17 Jun 2021 12:01:34 -0600 Subject: [PATCH] Change AFS*_LINUXnn_ENV to AFS*_LINUX_ENV The minimum Linux kernel that is now supported is linux-2.6.18. The Linux versioned preprocessor macros AFS_*LINUXnn_ENV are no longer needed to distinguish the different levels of Linux and can be merged into just a single set of macros. Perform a global change of _LINUX\d+_ENV to _LINUX_ENV. e.g. AFS_LINUX24_ENV -> AFS_LINUX_ENV AFS_USR_LINUX24_ENV -> AFS_USR_LINUX_ENV AFS_AMD64_LINUX20_ENV -> AFS_AMD64_LINUX_ENV Replace the multiple definitions for the versioned 'AFS*_LINUXnn_ENV' with just single non-version definitions 'AFS*_LINUX_ENV'. Apart from replacing the now-redundant #define directives and tidying up a few comments at the close of a preprocessor block to match their current form, this commit was done using a mechanical change of the variable names and did not reduce preprocessor statements that could now be combined or eliminated. Nor does this commit remove dead code. A follow-up commit (Cleanup AFS_*LINUX_ENV usage) will handle these changes. The updates should have no functional changes. Change-Id: I71e32ca9818d28f82b4f23679868d1b9a62c44bd Reviewed-on: https://gerrit.openafs.org/14387 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/JAVA/libjafs/ACL.c | 12 ++-- src/afs/LINUX/osi_groups.c | 20 +++---- src/afs/LINUX/osi_ioctl.c | 2 +- src/afs/LINUX/osi_machdep.h | 26 ++++----- src/afs/LINUX/osi_module.c | 2 +- src/afs/LINUX/osi_pag_module.c | 2 +- src/afs/LINUX/osi_probe.c | 110 ++++++++++++++++++------------------- src/afs/LINUX/osi_proc.c | 2 +- src/afs/LINUX/osi_syscall.c | 64 ++++++++++----------- src/afs/UKERNEL/sysincludes.h | 6 +- src/afs/VNOPS/afs_vnop_attrs.c | 26 ++++----- src/afs/VNOPS/afs_vnop_fid.c | 4 +- src/afs/VNOPS/afs_vnop_flock.c | 8 +-- src/afs/VNOPS/afs_vnop_lookup.c | 10 ++-- src/afs/VNOPS/afs_vnop_open.c | 2 +- src/afs/VNOPS/afs_vnop_read.c | 2 +- src/afs/VNOPS/afs_vnop_readdir.c | 4 +- src/afs/VNOPS/afs_vnop_strategy.c | 4 +- src/afs/VNOPS/afs_vnop_write.c | 2 +- src/afs/afs.h | 30 +++++----- src/afs/afs_analyze.c | 4 +- src/afs/afs_buffer.c | 6 +- src/afs/afs_bypasscache.h | 2 +- src/afs/afs_call.c | 24 ++++---- src/afs/afs_cbqueue.c | 2 +- src/afs/afs_conn.c | 4 +- src/afs/afs_daemons.c | 10 ++-- src/afs/afs_dcache.c | 2 +- src/afs/afs_error.c | 4 +- src/afs/afs_icl.c | 2 +- src/afs/afs_init.c | 30 +++++----- src/afs/afs_osi.c | 16 +++--- src/afs/afs_osi.h | 10 ++-- src/afs/afs_osi_alloc.c | 4 +- src/afs/afs_osi_pag.c | 30 +++++----- src/afs/afs_osi_vget.c | 4 +- src/afs/afs_osi_vm.c | 2 +- src/afs/afs_pag_call.c | 2 +- src/afs/afs_pioctl.c | 38 ++++++------- src/afs/afs_prototypes.h | 12 ++-- src/afs/afs_server.c | 4 +- src/afs/afs_syscall.c | 24 ++++---- src/afs/afs_user.c | 6 +- src/afs/afs_util.c | 4 +- src/afs/afs_vcache.c | 34 ++++++------ src/afs/afs_volume.c | 4 +- src/afs/afs_warn.c | 14 ++--- src/afs/afsincludes.h | 8 +-- src/afs/lock.h | 2 +- src/afs/sysincludes.h | 10 ++-- src/afsd/afsd.c | 18 +++--- src/afsd/afsd_kernel.c | 12 ++-- src/auth/ktc.c | 6 +- src/bozo/bnode.c | 2 +- src/butc/afsxbsa.c | 8 +-- src/butc/butc_xbsa.c | 2 +- src/butm/file_tm.c | 2 +- src/config/afs_args.h | 2 +- src/config/param.alpha_linux_26.h | 5 +- src/config/param.amd64_linux26.h | 5 +- src/config/param.arm64_linux26.h | 2 +- src/config/param.arm_linux26.h | 5 +- src/config/param.i386_linux26.h | 5 +- src/config/param.i386_umlinux26.h | 5 +- src/config/param.ia64_linux26.h | 5 +- src/config/param.linux26.h | 11 +--- src/config/param.ppc64_linux26.h | 5 +- src/config/param.ppc64le_linux26.h | 5 +- src/config/param.ppc_linux26.h | 5 +- src/config/param.s390_linux26.h | 5 +- src/config/param.s390x_linux26.h | 15 +---- src/config/param.sparc64_linux26.h | 5 +- src/config/param.sparc_linux26.h | 4 +- src/config/stds.h | 2 +- src/crypto/hcrypto/kernel/config.h | 4 +- src/dir/dir.c | 12 ++-- src/gtx/curseswindows.c | 2 +- src/kauth/kalog.h | 4 +- src/kauth/kaserver.c | 2 +- src/kauth/kauth.rg | 2 +- src/kauth/user.c | 2 +- src/libuafs/MakefileProto.LINUX.in | 2 +- src/lwp/iomgr.c | 6 +- src/lwp/lwp.c | 24 ++++---- src/lwp/lwp.h | 6 +- src/lwp/process.c | 28 +++++----- src/lwp/waitkey.c | 2 +- src/pam/afs_auth.c | 4 +- src/pam/afs_password.c | 4 +- src/pam/afs_session.c | 2 +- src/pam/afs_setcred.c | 4 +- src/pam/test_pam.c | 2 +- src/platform/IRIX/rcmd.c | 4 +- src/rx/UKERNEL/rx_knet.c | 4 +- src/rx/rx.c | 2 +- src/rx/rx_atomic.h | 2 +- src/rx/rx_internal.h | 2 +- src/rx/rx_kcommon.c | 30 +++++----- src/rx/rx_kcommon.h | 30 +++++----- src/rx/rx_kernel.h | 4 +- src/rx/rx_lwp.c | 2 +- src/rx/rx_packet.c | 12 ++-- src/rx/rx_packet.h | 4 +- src/rx/rx_prototypes.h | 4 +- src/rx/rx_pthread.c | 2 +- src/rx/rx_rdwr.c | 2 +- src/rx/rx_user.c | 10 ++-- src/rx/test/testclient.c | 4 +- src/rx/test/testserver.c | 4 +- src/rx/xdr.c | 6 +- src/rx/xdr.h | 2 +- src/rx/xdr_afsuuid.c | 2 +- src/rx/xdr_array.c | 6 +- src/rx/xdr_arrayn.c | 4 +- src/rx/xdr_int32.c | 2 +- src/rx/xdr_int64.c | 2 +- src/rx/xdr_rx.c | 4 +- src/rxgen/rpc_main.c | 4 +- src/rxkad/bg-fcrypt.c | 4 +- src/rxkad/fcrypt.c | 4 +- src/rxkad/rxkad_client.c | 2 +- src/sys/afssyscalls.h | 2 +- src/sys/glue.c | 2 +- src/sys/pioctl.c | 2 +- src/sys/setpag.c | 2 +- src/sys/sys_prototypes.h | 2 +- src/tools/dumpscan/dumptool.c | 2 +- src/uss/uss_common.h | 2 +- src/util/uuid.c | 2 +- src/util/vice.h | 2 +- src/venus/fstrace.c | 8 +-- src/venus/kdump.c | 87 ++++++++++++++--------------- src/viced/viced.c | 4 +- src/vol/daemon_com.h | 2 +- src/vol/ihandle.h | 6 +- src/vol/listinodes.c | 4 +- src/vol/partition.c | 14 ++--- src/vol/salvaged.c | 2 +- src/vol/salvager.c | 2 +- src/vol/vol-salvage.c | 2 +- src/vol/volume.c | 4 +- src/volser/volmain.c | 4 +- 142 files changed, 591 insertions(+), 639 deletions(-) diff --git a/src/JAVA/libjafs/ACL.c b/src/JAVA/libjafs/ACL.c index b818754..4b364ff 100644 --- a/src/JAVA/libjafs/ACL.c +++ b/src/JAVA/libjafs/ACL.c @@ -86,11 +86,11 @@ char* getACL(char *path) params.out = buffer; params.out_size = ACL_LEN; -#if defined(AFS_PPC64_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_PPC64_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) if(pioctl(path, VIOCGETAL, ¶ms, 1)) { -#else /* AFS_PPC_LINUX20_ENV */ +#else /* AFS_PPC_LINUX_ENV */ if(syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, VIOCGETAL, ¶ms, 1)) { -#endif /* AFS_PPC_LINUX20_ENV */ +#endif /* AFS_PPC_LINUX_ENV */ fprintf(stderr, "ERROR: ACL::getACL -> VIOCGETAL failed: %d, path: %s\n", errno, path); free(buffer); return NULL; @@ -117,11 +117,11 @@ jboolean setACL(char *path, char *aclString) params.out = NULL; params.out_size = 0; -#if defined(AFS_PPC64_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_PPC64_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) if(pioctl(path, VIOCSETAL, ¶ms, 1)) { -#else /* AFS_PPC_LINUX20_ENV */ +#else /* AFS_PPC_LINUX_ENV */ if(syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, VIOCSETAL, ¶ms, 1)) { -#endif /* AFS_PPC_LINUX20_ENV */ +#endif /* AFS_PPC_LINUX_ENV */ fprintf(stderr, "ERROR: ACL::setACL -> VIOCSETAL failed: %d, path: %s\n", errno, path); return JNI_FALSE; } diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c index a52cc68..87d149f 100644 --- a/src/afs/LINUX/osi_groups.c +++ b/src/afs/LINUX/osi_groups.c @@ -340,7 +340,7 @@ afs_xsetgroups32(int gidsetsize, gid_t * grouplist) return (-code); } -# if defined(AFS_PPC64_LINUX20_ENV) +# if defined(AFS_PPC64_LINUX_ENV) /* Intercept the uid16 system call as used by 32bit programs. */ extern asmlinkage long (*sys32_setgroupsp)(int gidsetsize, gid_t *grouplist); asmlinkage long afs32_xsetgroups(int gidsetsize, gid_t *grouplist) @@ -370,15 +370,15 @@ asmlinkage long afs32_xsetgroups(int gidsetsize, gid_t *grouplist) } # endif -# if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_LINUX20_ENV) +# if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) /* Intercept the uid16 system call as used by 32bit programs. */ -# ifdef AFS_AMD64_LINUX20_ENV +# ifdef AFS_AMD64_LINUX_ENV extern asmlinkage long (*sys32_setgroupsp) (int gidsetsize, u16 * grouplist); -# endif /* AFS_AMD64_LINUX20_ENV */ -# ifdef AFS_SPARC64_LINUX26_ENV +# endif /* AFS_AMD64_LINUX_ENV */ +# ifdef AFS_SPARC64_LINUX_ENV extern asmlinkage int (*sys32_setgroupsp) (int gidsetsize, __kernel_gid32_t * grouplist); -# endif /* AFS_SPARC64_LINUX26_ENV */ +# endif /* AFS_SPARC64_LINUX_ENV */ asmlinkage long afs32_xsetgroups(int gidsetsize, u16 * grouplist) { @@ -407,13 +407,13 @@ afs32_xsetgroups(int gidsetsize, u16 * grouplist) } /* Intercept the uid32 system call as used by 32bit programs. */ -# ifdef AFS_AMD64_LINUX20_ENV +# ifdef AFS_AMD64_LINUX_ENV extern asmlinkage long (*sys32_setgroups32p) (int gidsetsize, gid_t * grouplist); -# endif /* AFS_AMD64_LINUX20_ENV */ -# ifdef AFS_SPARC64_LINUX26_ENV +# endif /* AFS_AMD64_LINUX_ENV */ +# ifdef AFS_SPARC64_LINUX_ENV extern asmlinkage int (*sys32_setgroups32p) (int gidsetsize, __kernel_gid32_t * grouplist); -# endif /* AFS_SPARC64_LINUX26_ENV */ +# endif /* AFS_SPARC64_LINUX_ENV */ asmlinkage long afs32_xsetgroups32(int gidsetsize, gid_t * grouplist) { diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c index 7d35567..327520c 100644 --- a/src/afs/LINUX/osi_ioctl.c +++ b/src/afs/LINUX/osi_ioctl.c @@ -21,7 +21,7 @@ #include /* For syscall numbers. */ #include -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV #include #endif diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index fe48781..c120579 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -162,35 +162,35 @@ static inline long copyinstr(char *from, char *to, int count, int *length) { * Test to see for 64/32bit compatibility mode * Return non-zero if in a 64bit kernel and handing a 32bit syscall */ -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX_ENV) && !defined(AFS_IA64_LINUX_ENV) static inline int afs_in_compat_syscall(void) { # if defined(HAVE_LINUX_IN_COMPAT_SYSCALL) return in_compat_syscall(); -# elif defined(AFS_SPARC64_LINUX26_ENV) +# elif defined(AFS_SPARC64_LINUX_ENV) return test_thread_flag(TIF_32BIT); -# elif defined(AFS_SPARC64_LINUX24_ENV) +# elif defined(AFS_SPARC64_LINUX_ENV) return (current->thread.flags & SPARC_FLAG_32BIT) != 0; -# elif defined(AFS_SPARC64_LINUX20_ENV) +# elif defined(AFS_SPARC64_LINUX_ENV) return (current->tss.flags & SPARC_FLAG_32BIT) != 0; -# elif defined(AFS_AMD64_LINUX26_ENV) +# elif defined(AFS_AMD64_LINUX_ENV) return test_thread_flag(TIF_IA32); -# elif defined(AFS_AMD64_LINUX20_ENV) +# elif defined(AFS_AMD64_LINUX_ENV) return (current->thread.flags & THREAD_IA32) != 0; -# elif defined(AFS_PPC64_LINUX26_ENV) +# elif defined(AFS_PPC64_LINUX_ENV) # if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) return (current->thread_info->flags & _TIF_32BIT) != 0; # else return (task_thread_info(current)->flags & _TIF_32BIT) != 0; # endif -# elif defined(AFS_PPC64_LINUX20_ENV) +# elif defined(AFS_PPC64_LINUX_ENV) return (current->thread.flags & PPC_FLAG_32BIT) != 0; -# elif defined(AFS_S390X_LINUX26_ENV) +# elif defined(AFS_S390X_LINUX_ENV) return test_thread_flag(TIF_31BIT); -# elif defined(AFS_S390X_LINUX20_ENV) +# elif defined(AFS_S390X_LINUX_ENV) return (current->thread.flags & S390_FLAG_31BIT) != 0; -# elif defined(AFS_ARM64_LINUX26_ENV) +# elif defined(AFS_ARM64_LINUX_ENV) return is_compat_task(); # else # error afs_in_compat_syscall not done for this linux @@ -364,7 +364,7 @@ struct uio { #define OSIFILE_INODE(a) FILE_INODE((a)->filp) -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX_ENV) && !defined(AFS_IA64_LINUX_ENV) # define NEED_IOCTL32 #endif @@ -402,7 +402,7 @@ do { \ #define osi_InitGlock() -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV /* RHEL5 beta's kernel doesn't define these. They aren't gonna change, so... */ # ifndef __NR_ia32_afs_syscall diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c index 47e32cf..79ba57c 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -21,7 +21,7 @@ #include /* For syscall numbers. */ #include -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV #include #endif diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c index ac4f800..e832c5a 100644 --- a/src/afs/LINUX/osi_pag_module.c +++ b/src/afs/LINUX/osi_pag_module.c @@ -20,7 +20,7 @@ #include /* For syscall numbers. */ #include -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV #include #endif diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c index aea4bc6..9b06fa7 100644 --- a/src/afs/LINUX/osi_probe.c +++ b/src/afs/LINUX/osi_probe.c @@ -74,11 +74,11 @@ #include #include -#if defined(AFS_PPC64_LINUX26_ENV) +#if defined(AFS_PPC64_LINUX_ENV) # include #endif -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV # include #endif @@ -89,9 +89,9 @@ #endif /* lower bound of valid kernel text pointers */ -#ifdef AFS_IA64_LINUX20_ENV +#ifdef AFS_IA64_LINUX_ENV #define ktxt_lower_bound (((unsigned long)&kernel_thread ) & 0xfff00000L) -#elif defined(AFS_PPC64_LINUX20_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) #define ktxt_lower_bound (KERNELBASE) #else #define ktxt_lower_bound (((unsigned long)&kernel_thread ) & ~0xfffffL) @@ -100,7 +100,7 @@ /* On SPARC64 and S390X, sys_call_table contains 32-bit entries * even though pointers are 64 bit quantities. */ -#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_S390X_LINUX24_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) #define SYSCALLTYPE unsigned int #define PROBETYPE int #else @@ -108,7 +108,7 @@ #define PROBETYPE long #endif -#if defined(AFS_S390X_LINUX20_ENV) && !defined(AFS_S390X_LINUX26_ENV) +#if defined(AFS_S390X_LINUX_ENV) && !defined(AFS_S390X_LINUX_ENV) #define _SS(x) ((x) << 1) #define _SX(x) ((x) &~ 1) #else @@ -299,7 +299,7 @@ typedef struct { int debug_ignore_NR[4]; /* syscalls to ignore for debugging */ } probectl; -#if defined(AFS_I386_LINUX26_ENV) || defined(AFS_AMD64_LINUX26_ENV) +#if defined(AFS_I386_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) static int check_access(unsigned long, int); static int check_table_readable(probectl *, PROBETYPE *); #endif @@ -310,13 +310,13 @@ static int check_table_readable(probectl *, PROBETYPE *); /* syscall pairs/triplets to probe */ /* On PPC64 and SPARC64, we need to omit the ones that might match both tables */ static tryctl main_try[] = { -#if !defined(AFS_PPC64_LINUX20_ENV) && !defined(AFS_SPARC64_LINUX20_ENV) +#if !defined(AFS_PPC64_LINUX_ENV) && !defined(AFS_SPARC64_LINUX_ENV) #if defined(EXPORTED_SYS_CHDIR) { "scan: close+chdir+write", __NR_close, &sys_close, __NR_chdir, &sys_chdir, __NR_write, &sys_write }, #endif #endif { "scan: close+wait4", __NR_close, &sys_close, __NR_wait4, &sys_wait4, -1, 0 }, -#if !defined(AFS_PPC64_LINUX20_ENV) && !defined(AFS_SPARC64_LINUX20_ENV) +#if !defined(AFS_PPC64_LINUX_ENV) && !defined(AFS_SPARC64_LINUX_ENV) #if defined(EXPORTED_SYS_CHDIR) { "scan: close+chdir", __NR_close, &sys_close, __NR_chdir, &sys_chdir, -1, 0 }, #endif @@ -346,13 +346,13 @@ static int main_zapped_syscalls[] = { * other entries, or we might get a sys_ni_syscall into the list and * the test would no longer work. */ -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) /* mmap2, fstat64, getmsg, putmsg, modify_ldt */ 56, 63, 151, 152, 218, -#elif defined(AFS_SPARC_LINUX20_ENV) +#elif defined(AFS_SPARC_LINUX_ENV) /* memory_ordering, getmsg, putmsg, unimplemented, modify_ldt */ 52, 151, 152, 164, 218, -#else /* !AFS_SPARC_LINUX20_ENV */ +#else /* !AFS_SPARC_LINUX_ENV */ /* * These 7 syscalls are present in the syscall table on most "older" @@ -386,7 +386,7 @@ static int main_zapped_syscalls[] = { * corresponding __NR macros are not defined, so the tests above fail. * Instead, we just have to know the numbers for these. */ -#if defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) /* break, stty, gtty, ftime, prof, lock, mpx */ 17, 31, 32, 35, 44, 53, 56, #endif @@ -422,7 +422,7 @@ static int main_zapped_syscalls[] = { * unimplemented, but the __NR macros are not defined. Again, * we simply have to know their numbers. */ -#ifdef AFS_IA64_LINUX26_ENV +#ifdef AFS_IA64_LINUX_ENV /* create_module, query_module, get_kernel_sysms */ 1132, 1136, 1135, #endif @@ -456,23 +456,23 @@ static int main_zapped_syscalls[] = { * unimplemented calls are very similar. * mmap2 and fstat64 are implemented only for 32-bit calls */ -#ifdef AFS_PPC64_LINUX20_ENV +#ifdef AFS_PPC64_LINUX_ENV /* _mmap2, _fstat64 */ 192, 197, -#endif /* AFS_PPC64_LINUX20_ENV */ +#endif /* AFS_PPC64_LINUX_ENV */ /* Similarly for S390X, with lcown16 and fstat64 */ -#ifdef AFS_S390X_LINUX20_ENV +#ifdef AFS_S390X_LINUX_ENV /* lchown16, fstat64 */ 16, 197, #endif -#endif /* !AFS_SPARC_LINUX20_ENV */ +#endif /* !AFS_SPARC_LINUX_ENV */ 0 }; /* unique syscalls for try_harder */ static int main_unique_syscalls[] = { -#if defined(AFS_SPARC64_LINUX24_ENV) || defined(AFS_SPARC_LINUX24_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) /* * On SPARC, we need some additional unique calls to make sure * we don't match the SunOS-compatibility table. @@ -490,7 +490,7 @@ static probectl main_probe = { "system call table", /* syscall number of first entry in table */ -#ifdef AFS_IA64_LINUX20_ENV +#ifdef AFS_IA64_LINUX_ENV 1024, #else 0, @@ -507,9 +507,9 @@ static probectl main_probe = { main_try, /* array of combinations to try */ /* symbol in section to try scanning */ -#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) (unsigned long)&sys_close, -#elif defined(AFS_AMD64_LINUX26_ENV) +#elif defined(AFS_AMD64_LINUX_ENV) /* On this platform, it's in a different section! */ (unsigned long)&generic_ro_fops, #else @@ -519,24 +519,24 @@ static probectl main_probe = { /* default base address for scan */ /* base address bits to force to zero */ /* default length for scan */ -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) (unsigned long)(&sys_close), 0xfffff, 0x10000, -#elif defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#elif defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) /* bleah; this is so suboptimal */ (unsigned long)(&sys_close), 0xfffff, 0x20000, -#elif defined(AFS_IA64_LINUX20_ENV) +#elif defined(AFS_IA64_LINUX_ENV) (unsigned long)(&init_mm), 0x1fffff, 0x30000, -#elif defined(AFS_AMD64_LINUX26_ENV) +#elif defined(AFS_AMD64_LINUX_ENV) (unsigned long)(&generic_ro_fops) - 0x30000, 0, 0x6000, -#elif defined(AFS_PPC64_LINUX26_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) (unsigned long)(&do_signal), 0xfff, 0x400, @@ -564,13 +564,13 @@ static probectl main_probe = { /* syscalls to ignore for debugging */ { -#if defined(AFS_ALPHA_LINUX20_ENV) +#if defined(AFS_ALPHA_LINUX_ENV) 338, -#elif defined(AFS_AMD64_LINUX20_ENV) +#elif defined(AFS_AMD64_LINUX_ENV) 183, -#elif defined(AFS_IA64_LINUX20_ENV) +#elif defined(AFS_IA64_LINUX_ENV) 1141, -#elif defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_SPARC64_LINUX20_ENV) +#elif defined(AFS_SPARC_LINUX_ENV) || defined(AFS_SPARC64_LINUX_ENV) 227, #else 137, @@ -587,7 +587,7 @@ static probectl main_probe = { /********** Probing Configuration: amd64 ia32_sys_call_table **********/ -#if defined(AFS_AMD64_LINUX20_ENV) +#if defined(AFS_AMD64_LINUX_ENV) /* syscall pairs/triplets to probe */ static tryctl ia32_try[] = { @@ -672,7 +672,7 @@ static probectl *probe_list[] = { /********** Probing Configuration: IA64 **********/ -#elif defined(AFS_IA64_LINUX20_ENV) +#elif defined(AFS_IA64_LINUX_ENV) struct fptr { void *ip; unsigned long gp; @@ -685,7 +685,7 @@ static probectl *probe_list[] = { /********** Probing Configuration: ppc64, sparc64 sys_call_table32 **********/ -#elif defined(AFS_PPC64_LINUX20_ENV) || defined(AFS_SPARC64_LINUX20_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) || defined(AFS_SPARC64_LINUX_ENV) struct fptr { void *ip; unsigned long gp; @@ -702,12 +702,12 @@ static tryctl sct32_try[] = { /* zapped syscalls for try_harder */ static int sct32_zapped_syscalls[] = { -#ifdef AFS_PPC64_LINUX20_ENV +#ifdef AFS_PPC64_LINUX_ENV /* These should be sufficient */ __NR_break, __NR_stty, __NR_gtty, __NR_ftime, __NR_prof, __NR_lock, __NR_mpx, #endif -#ifdef AFS_SPARC64_LINUX20_ENV +#ifdef AFS_SPARC64_LINUX_ENV /* memory_ordering, getmsg, putmsg, unimplemented, modify_ldt */ 52, 151, 152, 164, 218, #endif @@ -717,11 +717,11 @@ static int sct32_zapped_syscalls[] = { /* unique syscalls for try_harder */ /* mmap2 and fstat64 are implemented only for 32-bit calls */ static int sct32_unique_syscalls[] = { -#ifdef AFS_PPC64_LINUX20_ENV +#ifdef AFS_PPC64_LINUX_ENV /* _mmap2, _fstat64 */ 192, 197, #endif -#ifdef AFS_SPARC64_LINUX24_ENV +#ifdef AFS_SPARC64_LINUX_ENV /* * On SPARC, we need some additional unique calls to make sure * we don't match the SunOS-compatibility table. @@ -752,7 +752,7 @@ static probectl sct32_probe = { sct32_try, /* array of combinations to try */ /* symbol in section to try scanning */ -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) (unsigned long)&sys_close, #else (unsigned long)&init_mm, @@ -761,11 +761,11 @@ static probectl sct32_probe = { /* default base address for scan */ /* base address bits to force to zero */ /* default length for scan */ -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) (unsigned long)(&sys_close), 0xfffff, 0x10000, -#elif defined(AFS_PPC64_LINUX26_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) (unsigned long)(&do_signal), 0xfff, 0x400, @@ -793,7 +793,7 @@ static probectl sct32_probe = { /* syscalls to ignore for debugging */ { -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) 227, #else 137, @@ -814,7 +814,7 @@ static probectl *probe_list[] = { * On earlier versions, the two tables were interleaved and so * have related base addresses. */ -#elif defined(AFS_S390X_LINUX26_ENV) +#elif defined(AFS_S390X_LINUX_ENV) /* syscall pairs/triplets to probe */ /* nothing worthwhile is exported, so this is empty */ @@ -917,7 +917,7 @@ static int check_table(probectl *P, PROBETYPE *ptr) PROBETYPE *x; int i, j; -#if defined(AFS_I386_LINUX26_ENV) || defined(AFS_AMD64_LINUX26_ENV) +#if defined(AFS_I386_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) i = check_table_readable(P, ptr); if (i >= 0) return i; #endif @@ -964,7 +964,7 @@ static void *try(probectl *P, tryctl *T, PROBETYPE *aptr, int ret; PROBETYPE *ptr; -#if defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV) +#if defined(AFS_IA64_LINUX_ENV) || defined(AFS_PPC64_LINUX_ENV) ip1 = T->fn1 ? (unsigned long)((struct fptr *)T->fn1)->ip : 0; ip2 = T->fn2 ? (unsigned long)((struct fptr *)T->fn2)->ip : 0; ip3 = T->fn3 ? (unsigned long)((struct fptr *)T->fn3)->ip : 0; @@ -984,7 +984,7 @@ static void *try(probectl *P, tryctl *T, PROBETYPE *aptr, return 0; for (offset = 0; offset < datalen; offset++, aptr++) { -#if defined(AFS_PPC64_LINUX20_ENV) +#if defined(AFS_PPC64_LINUX_ENV) ptr = (PROBETYPE*)(*aptr); if ((unsigned long)ptr <= KERNELBASE) { continue; @@ -993,7 +993,7 @@ static void *try(probectl *P, tryctl *T, PROBETYPE *aptr, ptr = aptr; #endif if ((unsigned long)ptr < init_mm.start_code || -#if defined(AFS_AMD64_LINUX20_ENV) +#if defined(AFS_AMD64_LINUX_ENV) (unsigned long)ptr > init_mm.brk) #else (unsigned long)ptr > init_mm.end_data) @@ -1044,7 +1044,7 @@ static int check_harder(probectl *P, PROBETYPE *p) unsigned long ip1; int i, s; -#if defined(AFS_I386_LINUX26_ENV) || defined(AFS_AMD64_LINUX26_ENV) +#if defined(AFS_I386_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) i = check_table_readable(P, p); if (i >= 0) return 0; #endif @@ -1074,7 +1074,7 @@ static int check_harder(probectl *P, PROBETYPE *p) } } -#if defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV) +#if defined(AFS_IA64_LINUX_ENV) || defined(AFS_PPC64_LINUX_ENV) ip1 = P->verify_fn ? (unsigned long)((struct fptr *)(P->verify_fn))->ip : 0; #else ip1 = (unsigned long)(P->verify_fn); @@ -1113,7 +1113,7 @@ static void *try_harder(probectl *P, PROBETYPE *ptr, unsigned long datalen) #endif for (offset = 0; offset < datalen; offset++, ptr++) { if ((unsigned long)ptr < init_mm.start_code || -#if defined(AFS_AMD64_LINUX20_ENV) +#if defined(AFS_AMD64_LINUX_ENV) (unsigned long)ptr > init_mm.brk) #else (unsigned long)ptr > init_mm.end_data) @@ -1190,7 +1190,7 @@ static void *scan_for_syscall_table(probectl *P, PROBETYPE *B, unsigned long L) { tryctl *T; void *answer; -#if defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) void *answer2; #endif #ifdef OSI_PROBE_DEBUG @@ -1210,7 +1210,7 @@ static void *scan_for_syscall_table(probectl *P, PROBETYPE *B, unsigned long L) for (T = P->trylist; T->name; T++) { answer = try(P, T, B, L); -#if defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) answer2 = try(P, T, (PROBETYPE *)(2 + (void *)B), L); #ifdef OSI_PROBE_DEBUG if (probe_debug & 0x0003) { @@ -1230,7 +1230,7 @@ static void *scan_for_syscall_table(probectl *P, PROBETYPE *B, unsigned long L) /* XXX more checks here */ answer = try_harder(P, B, L); -#if defined(AFS_S390_LINUX20_ENV) || defined(AFS_S390X_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) answer2 = try_harder(P, (PROBETYPE *)(2 + (void *)B), L); #ifdef OSI_PROBE_DEBUG if (probe_debug & 0x0005) { @@ -1335,7 +1335,7 @@ static void *do_find_syscall_table(probectl *P, char **method) #endif } -#if defined(AFS_I386_LINUX26_ENV) || defined(AFS_AMD64_LINUX26_ENV) +#if defined(AFS_I386_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) static int check_access(unsigned long address, int mode) { pgd_t *pgd = pgd_offset_k(address); @@ -1415,7 +1415,7 @@ void *osi_find_syscall_table(int which) return 0; } printk("Found %s at 0x%lx (%s)\n", P->desc, (unsigned long)answer, method); -#if defined(AFS_I386_LINUX26_ENV) || defined(AFS_AMD64_LINUX26_ENV) +#if defined(AFS_I386_LINUX_ENV) || defined(AFS_AMD64_LINUX_ENV) if (!check_access((unsigned long)answer, 1)) { printk("Address 0x%lx is not writable.\n", (unsigned long)answer); printk("System call hooks will not be installed; proceeding anyway\n"); diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c index 4ac51d3..9c5a080 100644 --- a/src/afs/LINUX/osi_proc.c +++ b/src/afs/LINUX/osi_proc.c @@ -25,7 +25,7 @@ #include /* For syscall numbers. */ #include -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV # include #endif diff --git a/src/afs/LINUX/osi_syscall.c b/src/afs/LINUX/osi_syscall.c index 921a7a8..836491c 100644 --- a/src/afs/LINUX/osi_syscall.c +++ b/src/afs/LINUX/osi_syscall.c @@ -37,7 +37,7 @@ osi_syscall_clean(void) #include /* For syscall numbers. */ #include -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV #include #endif @@ -54,7 +54,7 @@ osi_syscall_clean(void) * even though pointers are 64 bit quantities. * XXX unify this with osi_probe.c */ -#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_S390X_LINUX24_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_S390X_LINUX_ENV) #define SYSCALLTYPE unsigned int #define POINTER2SYSCALL (unsigned int)(unsigned long) #define SYSCALL2POINTER (void *)(long) @@ -64,7 +64,7 @@ osi_syscall_clean(void) #define SYSCALL2POINTER (void *) #endif -#if defined(AFS_S390X_LINUX24_ENV) +#if defined(AFS_S390X_LINUX_ENV) #define INSERT_SYSCALL(SLOT, TMPPAGE, FUNC) \ if (SYSCALL2POINTER FUNC > 0x7fffffff) { \ TMPPAGE = kmalloc ( PAGE_SIZE, GFP_DMA|GFP_KERNEL ); \ @@ -82,7 +82,7 @@ osi_syscall_clean(void) afs_sys_call_table[_S(SLOT)] = POINTER2SYSCALL FUNC; #endif -#if defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_IA64_LINUX_ENV) #define _S(x) ((x)-1024) #else #define _S(x) x @@ -96,7 +96,7 @@ afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4); static SYSCALLTYPE *afs_sys_call_table; static SYSCALLTYPE afs_ni_syscall = 0; -#ifdef AFS_S390X_LINUX24_ENV +#ifdef AFS_S390X_LINUX_ENV static void *afs_sys_setgroups_page = 0; #if defined(__NR_setgroups32) static void *afs_sys_setgroups32_page = 0; @@ -123,7 +123,7 @@ asmlinkage int (*sys_setgroups32p) (int gidsetsize, __kernel_gid32_t * grouplist); /***** AMD64 *****/ -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV static SYSCALLTYPE *afs_ia32_sys_call_table; static SYSCALLTYPE ia32_ni_syscall = 0; @@ -131,11 +131,11 @@ extern asmlinkage long afs32_xsetgroups(int gidsetsize, u16 * grouplist); asmlinkage long (*sys32_setgroupsp) (int gidsetsize, u16 * grouplist); extern asmlinkage long afs32_xsetgroups32(int gidsetsize, gid_t * grouplist); asmlinkage long (*sys32_setgroups32p) (int gidsetsize, gid_t * grouplist); -#endif /* AFS_AMD64_LINUX20_ENV */ +#endif /* AFS_AMD64_LINUX_ENV */ /***** PPC64 *****/ -#ifdef AFS_PPC64_LINUX26_ENV +#ifdef AFS_PPC64_LINUX_ENV static SYSCALLTYPE *afs_sys_call_table32; static SYSCALLTYPE afs_ni_syscall32 = 0; static SYSCALLTYPE old_sys_setgroupsp = 0; @@ -159,11 +159,11 @@ static void sys32_setgroups_stub(void) printf("*** error! sys32_setgroups_stub called\n"); } -#endif /* AFS_PPC64_LINUX26_ENV */ +#endif /* AFS_PPC64_LINUX_ENV */ /***** SPARC64 *****/ -#ifdef AFS_SPARC64_LINUX26_ENV +#ifdef AFS_SPARC64_LINUX_ENV static SYSCALLTYPE *afs_sys_call_table32; static SYSCALLTYPE afs_ni_syscall32 = 0; @@ -187,11 +187,11 @@ afs_syscall32(long syscall, long parm1, long parm2, long parm3, long parm4, "ret\n\t" "nop"); } -#endif /* AFS_SPARC64_LINUX20_ENV */ +#endif /* AFS_SPARC64_LINUX_ENV */ /***** IA64 *****/ -#ifdef AFS_IA64_LINUX20_ENV +#ifdef AFS_IA64_LINUX_ENV asmlinkage long afs_syscall_stub(int r0, int r1, long r2, long r3, long r4, long gp) @@ -266,7 +266,7 @@ struct fptr { unsigned long gp; }; -#endif /* AFS_IA64_LINUX20_ENV */ +#endif /* AFS_IA64_LINUX_ENV */ /***** PPC64 ***** * Spring 2005 @@ -277,7 +277,7 @@ struct fptr { * Horst Birthelmer * Marius Groeger */ -#if defined(AFS_PPC64_LINUX26_ENV) +#if defined(AFS_PPC64_LINUX_ENV) extern void flush_cache(void *, unsigned long); #define PPC_LO(v) ((v) & 0xffff) #define PPC_HI(v) (((v) >> 16) & 0xffff) @@ -388,7 +388,7 @@ static void * create_stub(struct ppc64_stub *stub, PPC64_STUB(afs_sys_call_stub); PPC64_STUB(afs_xsetgroups_stub); PPC64_STUB(afs_xsetgroups32_stub); -#endif /* AFS_PPC64_LINUX26_ENV */ +#endif /* AFS_PPC64_LINUX_ENV */ /**********************************************************************/ @@ -398,7 +398,7 @@ PPC64_STUB(afs_xsetgroups32_stub); int osi_syscall_init(void) { /***** IA64 *****/ -#ifdef AFS_IA64_LINUX20_ENV +#ifdef AFS_IA64_LINUX_ENV /* This needs to be first because we are declaring variables, and * also because the handling of syscall pointers is bizarre enough * that we want to special-case even the "common" part. @@ -436,7 +436,7 @@ int osi_syscall_init(void) /* XXX no 32-bit syscalls on IA64? */ -#elif defined(AFS_PPC64_LINUX26_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) afs_sys_call_table = osi_find_syscall_table(0); if (afs_sys_call_table) { @@ -481,7 +481,7 @@ int osi_syscall_init(void) sys32_setgroupsp = POINTER2SYSCALL sys32_setgroups_stub; } /***** COMMON (except IA64 or PPC64) *****/ -#else /* !AFS_IA64_LINUX20_ENV */ +#else /* !AFS_IA64_LINUX_ENV */ afs_sys_call_table = osi_find_syscall_table(0); if (afs_sys_call_table) { @@ -508,11 +508,11 @@ int osi_syscall_init(void) INSERT_SYSCALL(__NR_setgroups32, afs_sys_setgroups32_page, afs_xsetgroups32) #endif } -#endif /* !AFS_IA64_LINUX20_ENV */ +#endif /* !AFS_IA64_LINUX_ENV */ /***** AMD64 *****/ -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV afs_ia32_sys_call_table = osi_find_syscall_table(1); if (afs_ia32_sys_call_table) { /* setup AFS entry point for IA32 */ @@ -532,11 +532,11 @@ int osi_syscall_init(void) afs_ia32_sys_call_table[__NR_ia32_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32; } -#endif /* AFS_AMD64_LINUX20_ENV */ +#endif /* AFS_AMD64_LINUX_ENV */ /***** SPARC64 *****/ -#ifdef AFS_SPARC64_LINUX20_ENV +#ifdef AFS_SPARC64_LINUX_ENV afs_sys_call_table32 = osi_find_syscall_table(1); if (afs_sys_call_table32) { /* setup AFS entry point for 32-bit SPARC */ @@ -553,7 +553,7 @@ int osi_syscall_init(void) afs_sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32; } -#endif /* AFS_SPARC64_LINUX20_ENV */ +#endif /* AFS_SPARC64_LINUX_ENV */ return 0; } @@ -571,26 +571,26 @@ void osi_syscall_clean(void) afs_sys_call_table[_S(__NR_afs_syscall)] = afs_ni_syscall; /* put back setgroups */ -#if defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_IA64_LINUX_ENV) afs_sys_call_table[_S(__NR_setgroups)] = POINTER2SYSCALL((struct fptr *)sys_setgroupsp)->ip; -#elif defined(AFS_PPC64_LINUX26_ENV) +#elif defined(AFS_PPC64_LINUX_ENV) afs_sys_call_table[_S(__NR_setgroups)] = POINTER2SYSCALL old_sys_setgroupsp; /* put back setgroups32 for PPC64 */ afs_sys_call_table32[__NR_setgroups] = POINTER2SYSCALL old_sys32_setgroupsp; -#else /* AFS_IA64_LINUX20_ENV */ +#else /* AFS_IA64_LINUX_ENV */ afs_sys_call_table[_S(__NR_setgroups)] = POINTER2SYSCALL sys_setgroupsp; #endif -#if defined(__NR_setgroups32) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(__NR_setgroups32) && !defined(AFS_IA64_LINUX_ENV) /* put back setgroups32 */ afs_sys_call_table[__NR_setgroups32] = POINTER2SYSCALL sys_setgroups32p; #endif -#if defined(AFS_S390X_LINUX24_ENV) -#if defined(__NR_setgroups32) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_S390X_LINUX_ENV) +#if defined(__NR_setgroups32) && !defined(AFS_IA64_LINUX_ENV) if (afs_sys_setgroups32_page) kfree(afs_sys_setgroups32_page); #endif @@ -603,13 +603,13 @@ void osi_syscall_clean(void) /***** IA64 *****/ -#ifdef AFS_IA64_LINUX20_ENV +#ifdef AFS_IA64_LINUX_ENV /* XXX no 32-bit syscalls on IA64? */ #endif /***** AMD64 *****/ -#ifdef AFS_AMD64_LINUX20_ENV +#ifdef AFS_AMD64_LINUX_ENV if (afs_ia32_sys_call_table) { /* put back AFS entry point for IA32 */ afs_ia32_sys_call_table[__NR_ia32_afs_syscall] = @@ -627,7 +627,7 @@ void osi_syscall_clean(void) /***** SPARC64 *****/ -#ifdef AFS_SPARC64_LINUX20_ENV +#ifdef AFS_SPARC64_LINUX_ENV if (afs_sys_call_table32) { /* put back AFS entry point for 32-bit SPARC */ afs_sys_call_table32[__NR_afs_syscall] = afs_ni_syscall32; diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 1500065..03666b0 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -82,7 +82,7 @@ #include #endif /* AFS_USR_HPUX_ENV */ -#ifdef AFS_USR_LINUX22_ENV +#ifdef AFS_USR_LINUX_ENV #include /* _IOW() */ #include /* struct iovec */ #include /* struct timeval */ @@ -97,7 +97,7 @@ #include #include #define FREAD 0x0001 -#endif /* AFS_USR_LINUX22_ENV */ +#endif /* AFS_USR_LINUX_ENV */ #if defined(AFS_USR_DARWIN_ENV) || defined(AFS_USR_FBSD_ENV) || defined(AFS_USR_DFBSD_ENV) #ifdef _KERNEL @@ -150,7 +150,7 @@ typedef unsigned int fsblkcnt_t; #include /* glibc 2.2 has pthread_attr_setstacksize */ -#if (defined(AFS_LINUX22_ENV) && !defined(AFS_USR_LINUX22_ENV)) || (defined(AFS_USR_LINUX22_ENV) && (__GLIBC_MINOR__ < 2)) +#if (defined(AFS_LINUX_ENV) && !defined(AFS_USR_LINUX_ENV)) || (defined(AFS_USR_LINUX_ENV) && (__GLIBC_MINOR__ < 2)) #define pthread_attr_setstacksize(a,b) 0 #endif diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index 825ffe6..3432508 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -140,7 +140,7 @@ afs_CopyOutAttrs(struct vcache *avc, struct vattr *attrs) attrs->va_atime.tv_nsec = attrs->va_mtime.tv_nsec = attrs->va_ctime.tv_nsec = 0; attrs->va_gen = hgetlo(avc->f.m.DataVersion); -#elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV) || defined(AFS_LINUX26_ENV) +#elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV) || defined(AFS_LINUX_ENV) attrs->va_atime.tv_nsec = attrs->va_mtime.tv_nsec = attrs->va_ctime.tv_nsec = (hgetlo(avc->f.m.DataVersion) & 0x7ffff) * 1000; @@ -297,7 +297,7 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred) /* If it's the root of AFS, replace the inode number with the * inode number of the mounted on directory; otherwise this * confuses getwd()... */ -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV if (avc == afs_globalVp) { struct inode *ip = AFSTOV(avc)->i_sb->s_root->d_inode; attrs->va_nodeid = ip->i_ino; /* VTOI()? */ @@ -332,7 +332,7 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred) } # endif /* AFS_DARWIN80_ENV */ } -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ } afs_PutUser(au, READ_LOCK); } @@ -364,7 +364,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, #elif defined(AFS_AIX_ENV) /* Boy, was this machine dependent bogosity hard to swallow????.... */ if (av->va_mode != -1) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (av->va_mask & ATTR_MODE) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (av->va_mask & AT_MODE) { @@ -383,7 +383,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, } #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(av, va_gid)) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (av->va_mask & ATTR_GID) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (av->va_mask & AT_GID) { @@ -403,7 +403,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, } #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(av, va_uid)) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (av->va_mask & ATTR_UID) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (av->va_mask & AT_UID) { @@ -423,7 +423,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, } #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(av, va_modify_time)) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (av->va_mask & ATTR_MTIME) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (av->va_mask & AT_MTIME) { @@ -432,7 +432,7 @@ afs_VAttrToAS(struct vcache *avc, struct vattr *av, #endif /* AFS_DARWIN80_ENV */ mask |= AFS_SETMODTIME; #ifndef AFS_SGI_ENV -# if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX26_ENV) +# if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX_ENV) if (av->va_mtime.tv_nsec == -1) # else if (av->va_mtime.tv_usec == -1) @@ -469,7 +469,7 @@ afs_setattr(OSI_VC_DECL(avc), struct vattr *attrs, OSI_VC_CONVERT(avc); AFS_STATCNT(afs_setattr); -#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX22_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX_ENV) afs_Trace4(afs_iclSetp, CM_TRACE_SETATTR, ICL_TYPE_POINTER, avc, ICL_TYPE_INT32, attrs->va_mask, ICL_TYPE_OFFSET, ICL_HANDLE_OFFSET(attrs->va_size), ICL_TYPE_OFFSET, @@ -509,7 +509,7 @@ afs_setattr(OSI_VC_DECL(avc), struct vattr *attrs, */ #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(attrs, va_data_size)) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (attrs->va_mask & ATTR_SIZE) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (attrs->va_mask & AT_SIZE) { @@ -544,7 +544,7 @@ afs_setattr(OSI_VC_DECL(avc), struct vattr *attrs, #endif #if defined(AFS_DARWIN80_ENV) if (VATTR_IS_ACTIVE(attrs, va_data_size)) { -#elif defined(AFS_LINUX22_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) if (attrs->va_mask & ATTR_SIZE) { #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) if (attrs->va_mask & AT_SIZE) { @@ -566,13 +566,13 @@ afs_setattr(OSI_VC_DECL(avc), struct vattr *attrs, } else { code = afs_TruncateAllSegments(avc, tsize, treq, acred); } -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* We must update the Linux kernel's idea of file size as soon as * possible, to avoid racing with delayed writepages delivered by * pdflush */ if (code == 0) i_size_write(AFSTOV(avc), tsize); -#endif /* AFS_LINUX26_ENV */ +#endif /* AFS_LINUX_ENV */ #if defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) vnode_pager_setsize(vp, (u_long) tsize); #endif diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c index 3fa2edb..54e1956 100644 --- a/src/afs/VNOPS/afs_vnop_fid.c +++ b/src/afs/VNOPS/afs_vnop_fid.c @@ -17,7 +17,7 @@ #include "afs/param.h" -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) && !defined(AFS_NBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) && !defined(AFS_NBSD_ENV) #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* statistics */ @@ -151,4 +151,4 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp) } -#endif /* !AFS_LINUX20_ENV */ +#endif /* !AFS_LINUX_ENV */ diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 05363ff..45cc53f 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -122,7 +122,7 @@ lockIdSet(struct AFS_FLOCK *flock, struct SimpleLocks *slp, int clid) flock->l_pid = clid; } } -#elif defined(AFS_LINUX20_ENV) || defined(AFS_HPUX_ENV) +#elif defined(AFS_LINUX_ENV) || defined(AFS_HPUX_ENV) void lockIdSet(struct AFS_FLOCK *flock, struct SimpleLocks *slp, int clid) { @@ -173,7 +173,7 @@ lockIdcmp2(struct AFS_FLOCK *flock1, struct vcache *vp, #if defined(AFS_SUN5_ENV) proc_t *procp = ttoproc(curthread); #else -#if !defined(AFS_AIX41_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_SGI65_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) +#if !defined(AFS_AIX41_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_SGI65_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #ifdef AFS_SGI64_ENV afs_proc_t *procp = curprocp; #elif defined(UKERNEL) @@ -191,7 +191,7 @@ lockIdcmp2(struct AFS_FLOCK *flock1, struct vcache *vp, } #endif if ((flock1->l_pid == alp->pid) || -#if defined(AFS_AIX41_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_HPUX_ENV) +#if defined(AFS_AIX41_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_HPUX_ENV) (!onlymine && (flock1->l_pid == getppid())) #else #if defined(AFS_SGI65_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) @@ -541,7 +541,7 @@ DoLockWarning(struct vcache *avc, afs_ucred_t * acred) lastWarnTime = avc->lastBRLWarnTime = now; lastWarnPid = pid; -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV message = "byte-range locks only enforced for processes on this machine"; #else message = "byte-range lock/unlock ignored; make sure no one else is running this program"; diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index dd585e9..ae88797 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -1225,7 +1225,7 @@ afs_DoBulkStat(struct vcache *adp, long dirCookie, struct vrequest *areqp) * We only do this if the entry looks clear. */ afs_ProcessFS(tvcp, &statsp[i], areqp); -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) afs_fill_inode(AFSTOV(tvcp), NULL); /* reset inode operations */ #endif @@ -1597,7 +1597,7 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr goto done; } -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* * Special case of the dynamic mount volume in a static root. * This is really unfortunate, but we need this for the translator. @@ -1634,7 +1634,7 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr code = EACCES; goto done; } -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV if (tvc->mvstat == AFS_MVSTAT_ROOT) { /* we don't trust the dnlc for root vcaches */ AFS_RELE(AFSTOV(tvc)); *avcp = 0; @@ -1647,7 +1647,7 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr code = 0; hit = 1; goto done; -#endif /* linux22 */ +#endif /* AFS_LINUX_ENV */ } { /* sub-block just to reduce stack usage */ @@ -1965,7 +1965,7 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr if (!hit && (force_eval || tvc->mvstat != AFS_MVSTAT_MTPT)) { osi_dnlc_enter(adp, aname, tvc, &versionNo); } else { -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* So Linux inode cache is up to date. */ code = afs_VerifyVCache(tvc, treq); #else diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c index 678a4a7..fc947e8 100644 --- a/src/afs/VNOPS/afs_vnop_open.c +++ b/src/afs/VNOPS/afs_vnop_open.c @@ -151,7 +151,7 @@ afs_open(struct vcache **avcp, afs_int32 aflags, afs_ucred_t *acred) if (writing) tvc->execsOrWriters++; tvc->opens++; -#if defined(AFS_SGI_ENV) || defined (AFS_LINUX26_ENV) +#if defined(AFS_SGI_ENV) || defined (AFS_LINUX_ENV) if (writing && tvc->cred == NULL) { crhold(acred); tvc->cred = acred; diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c index e5c6642..e098278 100644 --- a/src/afs/VNOPS/afs_vnop_read.c +++ b/src/afs/VNOPS/afs_vnop_read.c @@ -548,7 +548,7 @@ afs_UFSReadUIO(afs_dcache_id_t *cacheId, struct uio *tuiop) AFS_GUNLOCK(); code = VOP_RDWR(tfile->vnode, tuiop, UIO_READ, 0, afs_osi_credp); AFS_GLOCK(); -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) AFS_GUNLOCK(); code = osi_rdwr(tfile, tuiop, UIO_READ); AFS_GLOCK(); diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c index 8d41c3e..ac2441e 100644 --- a/src/afs/VNOPS/afs_vnop_readdir.c +++ b/src/afs/VNOPS/afs_vnop_readdir.c @@ -111,7 +111,7 @@ BlobScan(struct dcache * afile, afs_int32 ablob, int *ablobOut) } -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) /* Changes to afs_readdir which affect dcache or vcache handling or use of * bulk stat data should also be reflected in the Linux specific verison of * the readdir routine. @@ -952,4 +952,4 @@ afs_readdir(OSI_VC_DECL(avc), struct uio *auio, afs_ucred_t *acred) return code; } -#endif /* !AFS_LINUX20_ENV */ +#endif /* !AFS_LINUX_ENV */ diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c index 978df88..c4296bb 100644 --- a/src/afs/VNOPS/afs_vnop_strategy.c +++ b/src/afs/VNOPS/afs_vnop_strategy.c @@ -16,7 +16,7 @@ #include "afs/param.h" -#if !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN80_ENV) #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -224,4 +224,4 @@ int afs_ustrategy(struct buf *abp) return code; } -#endif /* !AFS_HPUX_ENV && !AFS_SGI_ENV && !AFS_LINUX20_ENV */ +#endif /* !AFS_HPUX_ENV && !AFS_SGI_ENV && !AFS_LINUX_ENV */ diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index 32d69f4..90ad86c 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -145,7 +145,7 @@ afs_UFSWriteUIO(struct vcache *avc, afs_dcache_id_t *inode, struct uio *tuiop) code = VOP_RDWR(tfile->vnode, tuiop, UIO_WRITE, 0, afs_osi_credp); AFS_GLOCK(); } -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) AFS_GUNLOCK(); code = osi_rdwr(tfile, tuiop, UIO_WRITE); AFS_GLOCK(); diff --git a/src/afs/afs.h b/src/afs/afs.h index 96243ee..013f9fb 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -81,7 +81,7 @@ extern enum afs_shutdown_state afs_shuttingdown; #if defined(AFS_HPUX102_ENV) #define AFS_FLOCK k_flock #else -#if defined(AFS_SUN5_ENV) || (defined(AFS_LINUX24_ENV) && !(defined(AFS_LINUX26_ENV) && defined(AFS_LINUX_64BIT_KERNEL))) +#if defined(AFS_SUN5_ENV) || (defined(AFS_LINUX_ENV) && !(defined(AFS_LINUX_ENV) && defined(AFS_LINUX_64BIT_KERNEL))) #define AFS_FLOCK flock64 #else #define AFS_FLOCK flock @@ -294,7 +294,7 @@ struct afs_cbr { struct AFSFid fid; }; -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV /* On Linux, we have to be able to allocate the storage for this using * kmalloc, as otherwise we may deadlock. So, it needs to be able to fit * in a single page @@ -748,7 +748,7 @@ struct SimpleLocks { #elif defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) #define VREFCOUNT(v) ((v)->vrefCount) #define VREFCOUNT_GT(v, y) (AFSTOV(v)->v_usecount > (y)) -#elif defined(AFS_LINUX24_ENV) +#elif defined(AFS_LINUX_ENV) #define VREFCOUNT(v) atomic_read(&(AFSTOV(v)->v_count)) #define VREFCOUNT_GT(v, y) (VREFCOUNT(v)>y) #define VREFCOUNT_SET(v, c) atomic_set(&(AFSTOV(v)->v_count), c) @@ -783,7 +783,7 @@ struct nbvdata { }; #define VTOAFS(v) ((((struct nbvdata *)((v)->v_data)))->afsvc) #define AFSTOV(vc) ((vc)->v) -#elif defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_SUN511_ENV) || (defined(AFS_LINUX22_ENV) && !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)) +#elif defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_SUN511_ENV) || (defined(AFS_LINUX_ENV) && !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)) #define VTOAFS(v) ((struct vcache *)(v)->v_data) #define AFSTOV(vc) ((vc)->v) #else @@ -857,13 +857,13 @@ struct multiPage_range { * !(avc->nextfree) && !avc->vlruq.next => (FreeVCList == avc->nextfree) */ struct vcache { -#if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_SUN511_ENV) || (defined(AFS_LINUX22_ENV) && !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)) +#if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_SUN511_ENV) || (defined(AFS_LINUX_ENV) && !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE)) struct vnode *v; #else struct vnode v; /* Has reference count in v.v_count */ #endif struct afs_q vlruq; /* lru q next and prev */ -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) struct vcache *nextfree; /* next on free list (if free) */ #endif struct vcache *hnext; /* Hash next */ @@ -941,7 +941,7 @@ struct vcache { char cachingStates; /* Caching policies for this file */ afs_uint32 cachingTransitions; /* # of times file has flopped between caching and not */ -#if defined(AFS_LINUX24_ENV) +#if defined(AFS_LINUX_ENV) off_t next_seq_offset; /* Next sequential offset (used by prefetch/readahead) */ #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI65_ENV) off_t next_seq_blk_offset; /* accounted in blocks for Solaris & IRIX */ @@ -968,10 +968,10 @@ struct vcache { struct bhv_desc vc_bhv_desc; /* vnode's behavior data. */ #endif #endif /* AFS_SGI_ENV */ -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) cred_t *cred; /* last writer's cred */ #endif -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV struct dentry *target_link; /* dentry we prefer, when we are redirecting * all requests due to duplicate dentry aliases. * See LINUX/osi_vnodeops.c. Note that this is @@ -990,13 +990,13 @@ struct vcache { void *vpacRock; /* used to read or write in visible partitions */ #endif afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */ -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV spinlock_t pagewriter_lock; struct list_head pagewriters; /* threads that are writing vm pages */ #endif }; -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV struct pagewriter { struct list_head link; pid_t writer; @@ -1201,7 +1201,7 @@ typedef char *afs_ufs_dcache_id_t; * the size correctly. */ typedef ino64_t afs_ufs_dcache_id_t; -#elif defined(AFS_LINUX26_ENV) +#elif defined(AFS_LINUX_ENV) #define MAX_FH_LEN 10 typedef union { #if defined(NEW_EXPORT_OPS) @@ -1211,7 +1211,7 @@ typedef union { } afs_ufs_dcache_id_t; extern int cache_fh_type; extern int cache_fh_len; -#elif defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_S390X_LINUX24_ENV) +#elif defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_S390X_LINUX_ENV) typedef long afs_ufs_dcache_id_t; #elif defined(AFS_AIX51_ENV) || defined(AFS_HPUX1123_ENV) typedef ino_t afs_ufs_dcache_id_t; @@ -1561,7 +1561,7 @@ extern int afsd_dynamic_vcaches; #elif defined (AFS_DARWIN110_ENV) #define afs_cr_uid(cred) kauth_cred_getuid((kauth_cred_t)(cred)) #define afs_cr_gid(cred) kauth_cred_getgid((kauth_cred_t)(cred)) -#elif !(defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED)) +#elif !(defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED)) #define afs_cr_uid(cred) ((cred)->cr_uid) #define afs_cr_gid(cred) ((cred)->cr_gid) #if !defined(AFS_OBSD_ENV) @@ -1633,7 +1633,7 @@ typedef struct afs_event { /* no cond member */ #elif defined(AFS_FBSD_ENV) || defined(AFS_OBSD_ENV) int cond; /* "all this gluck should probably be replaced by CVs" */ -#elif defined(AFS_LINUX24_ENV) +#elif defined(AFS_LINUX_ENV) wait_queue_head_t cond; #elif defined(AFS_NBSD_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) kcondvar_t cond; /* Currently associated condition variable */ diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index 4bb212b..188d36e 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -18,7 +18,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifndef UKERNEL -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_FBSD_ENV) #include #include #endif @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* !UKERNEL */ diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c index c7a394d..37b70f9 100644 --- a/src/afs/afs_buffer.c +++ b/src/afs/afs_buffer.c @@ -14,7 +14,7 @@ #include "afs/sysincludes.h" #include "afsincludes.h" #if !defined(UKERNEL) -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) # include "h/param.h" #endif #include "h/types.h" @@ -22,7 +22,7 @@ #if defined(AFS_AIX31_ENV) #include "h/limits.h" #endif -#if !defined(AFS_AIX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX_ENV) #include "h/kernel.h" /* Doesn't needed, so it should go */ #endif #endif /* !defined(UKERNEL) */ @@ -31,7 +31,7 @@ #include "afsint.h" #include "afs/lock.h" -#if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV) +#if !defined(UKERNEL) && !defined(AFS_LINUX_ENV) #include "h/buf.h" #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_bypasscache.h b/src/afs/afs_bypasscache.h index 37c5669..2cda654 100644 --- a/src/afs/afs_bypasscache.h +++ b/src/afs/afs_bypasscache.h @@ -84,7 +84,7 @@ struct nocache_read_request { u_offset_t offset; struct seg *segment; caddr_t address; -#elif defined(AFS_LINUX24_ENV) || defined(UKERNEL) +#elif defined(AFS_LINUX_ENV) || defined(UKERNEL) /* The tested platform, as CITI impl. just packs ab->parms */ struct uio *auio; struct vrequest *areq; diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index b046df3..b99a286 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -19,7 +19,7 @@ #include "afs/afs_stats.h" #include "rx/rx_globals.h" #if !defined(UKERNEL) -# if !defined(AFS_LINUX20_ENV) +# if !defined(AFS_LINUX_ENV) # include "net/if.h" # ifdef AFS_SGI62_ENV # include "h/hashing.h" @@ -41,7 +41,7 @@ #define AFS_MINBUFFERS 50 #endif -#if (defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL) +#if (defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL) /* If AFS_DAEMONOP_ENV is defined, it indicates we run "daemon" AFS syscalls by * spawning a kernel thread to do the work, instead of running them in the * calling process. */ @@ -290,7 +290,7 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5, #endif -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) struct afsd_thread_info { # if !defined(INIT_WORK_HAS_DATA) struct work_struct tq; @@ -308,7 +308,7 @@ afsd_thread(void *rock) int (*sys_setpriority) (int, int, int) = sys_call_table[__NR_setpriority]; # endif # if !defined(HAVE_LINUX_KTHREAD_RUN) -# if defined(AFS_LINUX26_ENV) +# if defined(AFS_LINUX_ENV) daemonize("afsd"); # else daemonize(); @@ -317,7 +317,7 @@ afsd_thread(void *rock) /* doesn't do much, since we were forked from keventd, but * does call mm_release, which wakes up our parent (since it * used CLONE_VFORK) */ -# if !defined(AFS_LINUX26_ENV) +# if !defined(AFS_LINUX_ENV) reparent_to_init(); # endif afs_osi_MaskSignals(); @@ -440,13 +440,13 @@ afsd_thread(void *rock) } void -# if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA) +# if defined(AFS_LINUX_ENV) && !defined(INIT_WORK_HAS_DATA) afsd_launcher(struct work_struct *work) # else afsd_launcher(void *rock) # endif { -# if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA) +# if defined(AFS_LINUX_ENV) && !defined(INIT_WORK_HAS_DATA) struct afsd_thread_info *rock = container_of(work, struct afsd_thread_info, tq); # endif @@ -465,7 +465,7 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5, long parm6) { DECLARE_COMPLETION(c); -# if defined(AFS_LINUX26_ENV) +# if defined(AFS_LINUX_ENV) # if defined(INIT_WORK_HAS_DATA) struct work_struct tq; # endif @@ -478,7 +478,7 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5, } info.complete = &c; info.parm = parm; -# if defined(AFS_LINUX26_ENV) +# if defined(AFS_LINUX_ENV) # if !defined(INIT_WORK_HAS_DATA) INIT_WORK(&info.tq, afsd_launcher); schedule_work(&info.tq); @@ -1131,7 +1131,7 @@ afs_syscall_call(long parm, long parm2, long parm3, while (!afs_InitSetup_done) afs_osi_Sleep(&afs_InitSetup_done); -#if defined(AFS_SGI_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_SUN5_ENV) +#if defined(AFS_SGI_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_SUN5_ENV) temp = AFS_MINBUFFERS; /* Should fix this soon */ #else /* number of 2k buffers we could get from all of the buffer space */ @@ -1486,7 +1486,7 @@ afs_syscall_call(long parm, long parm2, long parm3, afs_SynchronousCloses = 'S'; } else if (parm == AFSOP_GETMTU) { afs_uint32 mtu = 0; -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) # ifdef AFS_USERSPACE_IP_ADDR afs_int32 i; i = rxi_Findcbi(parm2); @@ -1625,7 +1625,7 @@ afs_syscall_call(long parm, long parm2, long parm3, out: AFS_GUNLOCK(); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV return -code; #else return code; diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c index 85b3247..2dd6335 100644 --- a/src/afs/afs_cbqueue.c +++ b/src/afs/afs_cbqueue.c @@ -178,7 +178,7 @@ afs_DequeueCallback(struct vcache *avc) */ /* Sanity check on the callback queue. Allow for slop in the computation. */ -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) #define CBQ_LIMIT (afs_maxvcount + 10) #else #define CBQ_LIMIT (afs_cacheStats + afs_stats_cmperf.vcacheXAllocs + 10) diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c index ff7c403..668190a 100644 --- a/src/afs/afs_conn.c +++ b/src/afs/afs_conn.c @@ -18,7 +18,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif #include @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c index bd9fb56..46e1755 100644 --- a/src/afs/afs_daemons.c +++ b/src/afs/afs_daemons.c @@ -348,7 +348,7 @@ afs_CheckRootVolume(void) * count to zero and fs checkv is executed when the current * directory is /afs. */ -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV osi_ResetRootVCache(volid); #else # ifdef AFS_DARWIN80_ENV @@ -382,7 +382,7 @@ BPath(struct brequest *ab) struct dcache *tdc = NULL; struct vcache *tvc = NULL; struct vnode *tvn = NULL; -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV struct dentry *dp = NULL; #endif afs_size_t offset, len; @@ -394,7 +394,7 @@ BPath(struct brequest *ab) return; } AFS_GUNLOCK(); -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV code = gop_lookupname((char *)ab->ptr_parm[0], AFS_UIOSYS, 1, &dp); if (dp) tvn = (struct vnode *)dp->d_inode; @@ -411,7 +411,7 @@ BPath(struct brequest *ab) if (!tvn || !IsAfsVnode(tvn)) { /* release it and give up */ if (tvn) { -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV dput(dp); #else AFS_RELE(tvn); @@ -426,7 +426,7 @@ BPath(struct brequest *ab) if (tdc) { afs_PutDCache(tdc); } -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV dput(dp); #else AFS_RELE(tvn); diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index 1e11b15..56eed52 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -3427,7 +3427,7 @@ afs_InitCacheFile(char *afile, ino_t ainode) } } else { /* Add any other 'complex' inode types here ... */ -#if !defined(AFS_LINUX26_ENV) && !defined(AFS_CACHE_VNODE_PATH) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_CACHE_VNODE_PATH) tdc->f.inode.ufs = ainode; #else osi_Panic("Can't init cache with inode numbers when complex inodes are " diff --git a/src/afs/afs_error.c b/src/afs/afs_error.c index 42d3e23..24cc3e9 100644 --- a/src/afs/afs_error.c +++ b/src/afs/afs_error.c @@ -18,7 +18,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifndef UKERNEL -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_FBSD_ENV) #include #include #endif @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* !UKERNEL */ diff --git a/src/afs/afs_icl.c b/src/afs/afs_icl.c index f3af040..8432b88 100644 --- a/src/afs/afs_icl.c +++ b/src/afs/afs_icl.c @@ -15,7 +15,7 @@ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" #include "rx/rx_globals.h" -#if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV) +#if !defined(UKERNEL) && !defined(AFS_LINUX_ENV) #include "net/if.h" #ifdef AFS_SGI62_ENV #include "h/hashing.h" diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c index 34e79d2..e546ac1 100644 --- a/src/afs/afs_init.c +++ b/src/afs/afs_init.c @@ -22,7 +22,7 @@ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* afs statistics */ #include "rx/rxstat.h" -#if defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) +#if defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) # include #endif @@ -34,7 +34,7 @@ struct osi_dev cacheDev; /*Cache device */ afs_int32 cacheInfoModTime; /*Last time cache info modified */ #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV) struct mount *afs_cacheVfsp = 0; -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) struct super_block *afs_cacheSBp = 0; #else struct vfs *afs_cacheVfsp = 0; @@ -52,7 +52,7 @@ static struct vnode *volumeVnode; #endif afs_rwlock_t afs_discon_lock; extern afs_rwlock_t afs_disconDirtyLock; -#if defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) +#if defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) const struct cred *cache_creds; #endif @@ -157,7 +157,7 @@ afs_CacheInit(afs_int32 astatSize, afs_int32 afiles, afs_int32 ablocks, if (code) { return code; } -#if defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) +#if defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) /* * Save current credentials for later access to disk cache files. * If selinux, apparmor or other security modules are enabled, @@ -253,14 +253,14 @@ afs_LookupInodeByPath(char *filename, afs_ufs_dcache_id_t *inode, { afs_int32 code; -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) struct dentry *dp; code = gop_lookupname(filename, AFS_UIOSYS, 0, &dp); if (code) return code; osi_get_fh(dp, inode); dput(dp); -#else /* AFS_LINUX22_ENV */ +#else /* AFS_LINUX_ENV */ struct vnode *filevp; code = gop_lookupname(filename, AFS_UIOSYS, 0, &filevp); if (code) @@ -275,7 +275,7 @@ afs_LookupInodeByPath(char *filename, afs_ufs_dcache_id_t *inode, else { AFS_RELE(filevp); } -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ return 0; } @@ -383,7 +383,7 @@ afs_InitCacheInfo(char *afile) struct osi_stat tstat; struct osi_file *tfile; struct afs_fheader theader; -#ifndef AFS_LINUX22_ENV +#ifndef AFS_LINUX_ENV struct vnode *filevp; #endif int goodFile; @@ -391,7 +391,7 @@ afs_InitCacheInfo(char *afile) AFS_STATCNT(afs_InitCacheInfo); if (cacheDiskType != AFS_FCACHE_TYPE_UFS) osi_Panic("afs_InitCacheInfo --- called for non-ufs cache!"); -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV code = osi_InitCacheInfo(afile); if (code) return code; @@ -423,7 +423,7 @@ afs_InitCacheInfo(char *afile) if (!VFS_STATVFS(filevp->v_vfsp, &st)) # elif defined(AFS_AIX41_ENV) if (!VFS_STATFS(filevp->v_vfsp, &st, &afs_osi_cred)) -# elif defined(AFS_LINUX20_ENV) +# elif defined(AFS_LINUX_ENV) { KERNEL_SPACE_DECL; TO_USER_SPACE(); @@ -459,7 +459,7 @@ afs_InitCacheInfo(char *afile) afs_fsfragsize = st.f_bsize - 1; # endif /* AFS_SUN5_ENV || AFS_HPUX100_ENV */ } -# if defined(AFS_LINUX20_ENV) +# if defined(AFS_LINUX_ENV) cacheInode.ufs = filevp->i_ino; afs_cacheSBp = filevp->i_sb; # elif defined(AFS_XBSD_ENV) @@ -483,9 +483,9 @@ afs_InitCacheInfo(char *afile) afs_LookupInodeByPath(afile, &cacheInode.ufs, NULL); # endif /* !AFS_CACHE_VNODE_PATH */ cacheDev.dev = afs_vnodeToDev(filevp); -# endif /* AFS_LINUX20_ENV */ +# endif /* AFS_LINUX_ENV */ AFS_RELE(filevp); -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ if (afs_fsfragsize < AFS_MIN_FRAGSIZE) { afs_fsfragsize = AFS_MIN_FRAGSIZE; } @@ -734,7 +734,7 @@ shutdown_cache(void) memset(&cacheDev, 0, sizeof(struct osi_dev)); osi_dnlc_shutdown(); } -#if defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) +#if defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED) put_cred(cache_creds); #endif } /*shutdown_cache */ @@ -745,7 +745,7 @@ shutdown_vnodeops(void) { AFS_STATCNT(shutdown_vnodeops); if (afs_cold_shutdown) { -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV afs_rd_stash_i = 0; #endif shutdown_mariner(); diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index 1289d22..0dab7e6 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -103,13 +103,13 @@ osi_Init(void) afs_osi_credp = kcred; #else memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) afs_set_cr_group_info(&afs_osi_cred, groups_alloc(0)); #endif #if defined(AFS_DARWIN80_ENV) afs_osi_cred.cr_ref = 1; /* kauth_cred_get_ref needs 1 existing ref */ #else -# if !(defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED)) +# if !(defined(AFS_LINUX_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED)) crhold(&afs_osi_cred); /* don't let it evaporate */ # endif #endif @@ -129,7 +129,7 @@ osi_Init(void) void afs_osi_MaskSignals(void) { -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV osi_linux_mask(); #endif } @@ -138,7 +138,7 @@ afs_osi_MaskSignals(void) void afs_osi_UnmaskRxkSignals(void) { -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV osi_linux_unmaskrxk(); #endif } @@ -173,7 +173,7 @@ afs_osi_RxkRegister(void) void afs_osi_Invisible(void) { -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV afs_osi_MaskSignals(); #elif defined(AFS_SUN5_ENV) curproc->p_flag |= SSYS; @@ -221,7 +221,7 @@ shutdown_osi(void) afs_osi_ctxtp_initialized = 0; } #endif -#if !defined(AFS_HPUX_ENV) && !defined(UKERNEL) && !defined(AFS_DFBSD_ENV) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_HPUX_ENV) && !defined(UKERNEL) && !defined(AFS_DFBSD_ENV) && !defined(AFS_LINUX_ENV) /* LINUX calls this from afs_cleanup() which hooks into module_exit */ shutdown_osisleep(); #endif @@ -250,9 +250,9 @@ shutdown_osisleep(void) afs_osi_Free(tmp, sizeof(*tmp)); #elif defined(AFS_SGI_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_SUN5_ENV) osi_FreeSmallSpace(tmp); -#elif defined(AFS_LINUX26_ENV) +#elif defined(AFS_LINUX_ENV) kfree(tmp); -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) osi_linux_free(tmp); #endif } diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index b28b4a7..4dc6101 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -11,7 +11,7 @@ #define _AFS_OSI_ #include "h/types.h" -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) #include "h/param.h" #endif @@ -23,7 +23,7 @@ #include #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #ifndef _LINUX_CODA_FS_I #define _LINUX_CODA_FS_I #define _CODA_HEADER_ @@ -60,10 +60,10 @@ struct osi_stat { struct osi_file { afs_int32 size; /* file size in bytes XXX Must be first field XXX */ -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV struct file *filp; /* May need this if we really open the file. */ #else -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV struct dentry dentry; /* merely to hold the pointer to the inode. */ struct file file; /* May need this if we really open the file. */ #else @@ -133,7 +133,7 @@ struct afs_osi_WaitHandle { * * Darwin, all of the BSDs, and Linux have their own */ -#if !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_LINUX_ENV) # define vType(vc) AFSTOV(vc)->v_type # define vSetType(vc,type) AFSTOV(vc)->v_type = (type) # define vSetVfsp(vc,vfsp) AFSTOV(vc)->v_vfsp = (vfsp) diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c index 78254d6..4e76d32 100644 --- a/src/afs/afs_osi_alloc.c +++ b/src/afs/afs_osi_alloc.c @@ -50,7 +50,7 @@ afs_osi_Alloc(size_t size) AFS_STATS(afs_stats_cmperf.OutStandingAllocs++); AFS_STATS(afs_stats_cmperf.OutStandingMemUsage += size); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV return osi_linux_alloc(size, 1); #else return AFS_KALLOC(size); @@ -66,7 +66,7 @@ afs_osi_Free(void *x, size_t asize) AFS_STATS(afs_stats_cmperf.OutStandingAllocs--); AFS_STATS(afs_stats_cmperf.OutStandingMemUsage -= asize); -#if defined(AFS_LINUX20_ENV) +#if defined(AFS_LINUX_ENV) osi_linux_free(x); #else AFS_KFREE(x, asize); diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c index c0667d9..f29fea6 100644 --- a/src/afs/afs_osi_pag.c +++ b/src/afs/afs_osi_pag.c @@ -71,19 +71,19 @@ afs_uint32 genpag(void) { AFS_STATCNT(genpag); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* Ensure unique PAG's (mod 200 days) when reloading the client. */ return (('A' << 24) + ((pag_epoch + pagCounter++) & 0xffffff)); -#else /* AFS_LINUX20_ENV */ +#else /* AFS_LINUX_ENV */ return (('A' << 24) + (pagCounter++ & 0xffffff)); -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ } afs_uint32 getpag(void) { AFS_STATCNT(getpag); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* Ensure unique PAG's (mod 200 days) when reloading the client. */ return (('A' << 24) + ((pag_epoch + pagCounter) & 0xffffff)); #else @@ -100,18 +100,18 @@ afs_uint32 genpag(void) { AFS_STATCNT(genpag); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV return (pag_epoch + pagCounter++); #else return (pagCounter++); -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ } afs_uint32 getpag(void) { AFS_STATCNT(getpag); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* Ensure unique PAG's (mod 200 days) when reloading the client. */ return (pag_epoch + pagCounter); #else @@ -251,7 +251,7 @@ afs_setpag(void) credp = OSI_GET_CURRENT_CRED(); code = AddPag(genpag(), &credp); } -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) { afs_ucred_t *credp = crref(); code = AddPag(genpag(), &credp); @@ -362,7 +362,7 @@ afs_setpag_val(int pagval) credp = OSI_GET_CURRENT_CRED(); code = AddPag(pagval, &credp); } -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) { afs_ucred_t *credp = crref(); code = AddPag(pagval, &credp); @@ -451,7 +451,7 @@ AddPag(afs_int32 aval, afs_ucred_t **credpp) int afs_InitReq(struct vrequest *av, afs_ucred_t *acred) { -#if defined(AFS_LINUX26_ENV) && !defined(AFS_NONFSTRANS) +#if defined(AFS_LINUX_ENV) && !defined(AFS_NONFSTRANS) int code; #endif @@ -460,7 +460,7 @@ afs_InitReq(struct vrequest *av, afs_ucred_t *acred) if (afs_shuttingdown == AFS_SHUTDOWN) return EIO; -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV #if !defined(AFS_NONFSTRANS) if (osi_linux_nfs_initreq(av, acred, &code)) return code; @@ -599,7 +599,7 @@ afs_get_groups_from_pag(afs_uint32 pag, gid_t *g0p, gid_t *g1p) } #endif -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* osi_get_group_pag is defined in /osi_groups.c */ #elif defined(AFS_PAG_ONEGROUP_ENV) /* osi_get_group_pag is defined in /osi_groups.c */ @@ -639,10 +639,10 @@ osi_get_group_pag(afs_ucred_t *cred) # if defined(AFS_AIX_ENV) if (cred->cr_ngrps < 2) return NOPAG; -# elif defined(AFS_LINUX26_ENV) +# elif defined(AFS_LINUX_ENV) if (afs_cr_group_info(cred)->ngroups < AFS_NUMPAGGROUPS) return NOPAG; -# elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV) +# elif defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_XBSD_ENV) # if defined(AFS_SUN510_ENV) if (ngroups < 2) { # else @@ -678,7 +678,7 @@ PagInCred(afs_ucred_t *cred) return NOPAG; } #ifndef AFS_DARWIN110_ENV -#if defined(AFS_LINUX26_ENV) && defined(LINUX_KEYRING_SUPPORT) +#if defined(AFS_LINUX_ENV) && defined(LINUX_KEYRING_SUPPORT) /* * If linux keyrings are in use and we carry the session keyring in our credentials * structure, they should be the only criteria for determining diff --git a/src/afs/afs_osi_vget.c b/src/afs/afs_osi_vget.c index cb9c017..cec4882 100644 --- a/src/afs/afs_osi_vget.c +++ b/src/afs/afs_osi_vget.c @@ -21,7 +21,7 @@ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN80_ENV) /* This is the common part of the vget VFS call. */ int afs_osi_vget(struct vcache **avcpp, struct fid *afidp, struct vrequest *areqp) @@ -72,4 +72,4 @@ afs_osi_vget(struct vcache **avcpp, struct fid *afidp, struct vrequest *areqp) return code; } -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ diff --git a/src/afs/afs_osi_vm.c b/src/afs/afs_osi_vm.c index 5c1c03a..890632d 100644 --- a/src/afs/afs_osi_vm.c +++ b/src/afs/afs_osi_vm.c @@ -22,7 +22,7 @@ int osi_Active(struct vcache *avc) { AFS_STATCNT(osi_Active); -#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || (AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || (AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if ((avc->opens > 0) || (avc->f.states & CMAPPED)) return 1; /* XXX: Warning, verify this XXX */ #elif defined(AFS_SGI_ENV) diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c index a20e3e6..4cfd7cc 100644 --- a/src/afs/afs_pag_call.c +++ b/src/afs/afs_pag_call.c @@ -16,7 +16,7 @@ #include "afs/afs_stats.h" #include "rx/rx_globals.h" #include "rx/rxstat.h" -#if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV) +#if !defined(UKERNEL) && !defined(AFS_LINUX_ENV) #include "net/if.h" #include "netinet/in_var.h" #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 4a705cc..d3b0177 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -312,7 +312,7 @@ DECL_PIOCTL(PNFSNukeCreds); DECL_PIOCTL(PNewUuid); DECL_PIOCTL(PPrecache); DECL_PIOCTL(PGetPAG); -#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX24_ENV) +#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX_ENV) DECL_PIOCTL(PSetCachingThreshold); #endif @@ -436,7 +436,7 @@ static pioctlFunction CpioctlSw[] = { static pioctlFunction OpioctlSw[] = { PBogus, /* 0 */ PNFSNukeCreds, /* 1 -- nuke all creds for NFS client */ -#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX24_ENV) +#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX_ENV) PSetCachingThreshold /* 2 -- get/set cache-bypass size threshold */ #else PNoop /* 2 -- get/set cache-bypass size threshold */ @@ -708,7 +708,7 @@ afs_xioctl(struct afs_ioctl_sys *uap, rval_t *rvp) return (code); } -#elif defined(AFS_LINUX22_ENV) +#elif defined(AFS_LINUX_ENV) struct afs_ioctl_sys { unsigned int com; unsigned long arg; @@ -1019,7 +1019,7 @@ afs_pioctl(afs_proc_t *p, void *args, int *retval) #endif /* macro to avoid adding any more #ifdef's to pioctl code. */ -#if defined(AFS_LINUX22_ENV) || defined(AFS_AIX41_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_AIX41_ENV) #define PIOCTL_FREE_CRED() crfree(credp) #else #define PIOCTL_FREE_CRED() @@ -1045,7 +1045,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) #ifdef AFS_NEED_CLIENTCONTEXT afs_ucred_t *tmpcred = NULL; #endif -#if defined(AFS_NEED_CLIENTCONTEXT) || defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +#if defined(AFS_NEED_CLIENTCONTEXT) || defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_ucred_t *foreigncreds = NULL; #endif afs_int32 code = 0; @@ -1053,7 +1053,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) #ifdef AFS_AIX41_ENV struct ucred *credp = crref(); /* don't free until done! */ #endif -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV cred_t *credp = crref(); /* don't free until done! */ struct dentry *dp; #endif @@ -1071,7 +1071,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) } if ((com & 0xff) == PSetClientContext) { #ifdef AFS_NEED_CLIENTCONTEXT -#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX_ENV) code = HandleClientContext(&data, &com, &foreigncreds, credp); #else code = HandleClientContext(&data, &com, &foreigncreds, osi_curcred()); @@ -1101,7 +1101,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) * like afs_osi_suser(cred) which, I think, is better since it * generalizes and supports multi cred environments... */ -#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX22_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) tmpcred = credp; credp = foreigncreds; #elif defined(AFS_AIX41_ENV) @@ -1124,7 +1124,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) if ((com & 0xff00) >> 8 == 'V' && (com & 0xff) == 15) { /* special case prefetch so entire pathname eval occurs in helper process. * otherwise, the pioctl call is essentially useless */ -#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) code = Prefetch(path, &data, follow, foreigncreds ? foreigncreds : credp); @@ -1144,13 +1144,13 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) lookupname(path, USR, follow, NULL, &vp, foreigncreds ? foreigncreds : credp); #else -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV code = gop_lookupname_user(path, AFS_UIOUSER, follow, &dp); if (!code) vp = (struct vnode *)dp->d_inode; #else code = gop_lookupname_user(path, AFS_UIOUSER, follow, &vp); -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ #endif /* AFS_AIX41_ENV */ AFS_GLOCK(); if (code) { @@ -1211,7 +1211,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) credp = OSI_GET_CURRENT_CRED(); code = afs_HandlePioctl(vp, com, &data, follow, &credp); } -#elif defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +#elif defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) code = afs_HandlePioctl(vp, com, &data, follow, &credp); #elif defined(UKERNEL) code = afs_HandlePioctl(vp, com, &data, follow, @@ -1237,7 +1237,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) set_p_cred(u.u_procp, tmpcred); /* restore original credentials */ #elif defined(AFS_SGI_ENV) OSI_SET_CURRENT_CRED(tmpcred); /* restore original credentials */ -#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX22_ENV) +#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) credp = tmpcred; /* restore original credentials */ #else osi_curcred() = tmpcred; /* restore original credentials */ @@ -1247,7 +1247,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) } #endif /* AFS_NEED_CLIENTCONTEXT */ if (vp) { -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV /* * Holding the global lock when calling dput can cause a deadlock * when the kernel calls back into afs_dentry_iput @@ -1830,7 +1830,7 @@ _settok_tokenCell(char *cellName, int *cellNum, int *primary) { } -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) static_inline int _settok_setParentPag(afs_ucred_t **cred) { @@ -4614,7 +4614,7 @@ HandleClientContext(struct afs_ioctl *ablob, int *com, #ifdef AFS_AIX51_ENV newcred->cr_groupset.gs_union.un_groups[0] = g0; newcred->cr_groupset.gs_union.un_groups[1] = g1; -#elif defined(AFS_LINUX26_ENV) +#elif defined(AFS_LINUX_ENV) # ifdef AFS_PAG_ONEGROUP_ENV afs_set_cr_group_info(newcred, groups_alloc(1)); /* nothing sets this */ l = (((g0-0x3f00) & 0x3fff) << 14) | ((g1-0x3f00) & 0x3fff); @@ -4641,8 +4641,8 @@ HandleClientContext(struct afs_ioctl *ablob, int *com, #endif #ifdef AFS_AIX_ENV newcred->cr_ngrps = 2; -#elif !defined(AFS_LINUX26_ENV) && !defined(AFS_SUN510_ENV) -# if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_FBSD_ENV) +#elif !defined(AFS_LINUX_ENV) && !defined(AFS_SUN510_ENV) +# if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) newcred->cr_ngroups = 2; # else for (i = 2; i < NGROUPS; i++) @@ -5124,7 +5124,7 @@ DECL_PIOCTL(PNewUuid) return 0; } -#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX24_ENV) +#if defined(AFS_CACHE_BYPASS) && defined(AFS_LINUX_ENV) DECL_PIOCTL(PSetCachingThreshold) { diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 77eb1f8..c70e460 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -619,8 +619,8 @@ extern void osi_ReleaseVM(struct vcache *avc, afs_ucred_t *acred); extern int osi_readRandom(void *, afs_size_t); /* LINUX/osi_misc.c */ -#ifdef AFS_LINUX20_ENV -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV +#ifdef AFS_LINUX_ENV extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink, struct dentry **dpp); extern int osi_InitCacheInfo(char *aname); @@ -684,7 +684,7 @@ extern int afs_syscall_iincdec(int, int, int, int); /* ARCH/osi_file.c */ extern int afs_osicred_initialized; extern void *osi_UFSOpen(afs_dcache_id_t *ainode); -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) extern void osi_get_fh(struct dentry *dp, afs_ufs_dcache_id_t *ainode); #endif extern int afs_osi_Stat(struct osi_file *afile, @@ -723,7 +723,7 @@ extern int setpag(afs_proc_t *proc, struct ucred **cred, afs_uint32 pagvalue, # endif /* AFS_XBSD_ENV */ #endif /* UKERNEL */ -#if defined(AFS_LINUX26_ENV) || defined(AFS_PAG_ONEGROUP_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_PAG_ONEGROUP_ENV) extern afs_int32 osi_get_group_pag(afs_ucred_t *cred); #endif @@ -769,7 +769,7 @@ extern struct mount *afs_globalVFS; extern struct vfs *afs_globalVFS; #endif extern struct vcache *afs_globalVp; -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV extern void vcache2inode(struct vcache *avc); extern void vcache2fakeinode(struct vcache *rootvp, struct vcache *mpvp); #endif @@ -1426,7 +1426,7 @@ extern void afs_ntohuuid(afsUUID * uuidp); extern afs_int32 afs_uuid_create(afsUUID * uuid); extern u_short afs_uuid_hash(afsUUID * uuid); -#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI62_ENV) || defined(UKERNEL) +#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI62_ENV) || defined(UKERNEL) #include "osi_prototypes.h" #endif diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index d4893b1..27c06f3 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -37,7 +37,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) -# if !defined(AFS_LINUX20_ENV) +# if !defined(AFS_LINUX_ENV) # include # endif # include @@ -45,7 +45,7 @@ # ifdef AFS_SGI62_ENV # include "h/hashing.h" # endif -# if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +# if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) # include # endif /* AFS_HPUX110_ENV */ # ifdef AFS_DARWIN_ENV diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c index 9414f38..ebb0d14 100644 --- a/src/afs/afs_syscall.c +++ b/src/afs/afs_syscall.c @@ -19,7 +19,7 @@ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" #include "rx/rx_globals.h" -#if !defined(UKERNEL) && !defined(AFS_LINUX20_ENV) +#if !defined(UKERNEL) && !defined(AFS_LINUX_ENV) #include "net/if.h" #ifdef AFS_SGI62_ENV #include "h/hashing.h" @@ -113,7 +113,7 @@ copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst) } #endif /* defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64) */ -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX_ENV) && !defined(AFS_IA64_LINUX_ENV) if (afs_in_compat_syscall()) { struct afs_ioctl32 dst32; @@ -313,7 +313,7 @@ struct iparam32 { }; -#if defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN5_64BIT_ENV) || (defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)) || defined(NEED_IOCTL32) +#if defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN5_64BIT_ENV) || (defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX_ENV) && !defined(AFS_IA64_LINUX_ENV)) || defined(NEED_IOCTL32) static void iparam32_to_iparam(const struct iparam32 *src, struct iparam *dst) { @@ -359,7 +359,7 @@ copyin_iparam(caddr_t cmarg, struct iparam *dst) } #endif /* AFS_SUN5_64BIT_ENV */ -#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) +#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX_ENV) && !defined(AFS_IA64_LINUX_ENV) if (afs_in_compat_syscall()) { struct iparam32 dst32; @@ -439,7 +439,7 @@ afs3_syscall(afs_proc_t *p, void *args, long *retval) long parm5; long parm6; } *uap = (struct a *)args; -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) struct afssysargs { long syscall; long parm1; @@ -457,7 +457,7 @@ afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4) long linux_ret = 0; long *retval = &linux_ret; long eparm[4]; /* matches AFSCALL_ICL in fstrace.c */ -# ifdef AFS_SPARC64_LINUX24_ENV +# ifdef AFS_SPARC64_LINUX_ENV afs_int32 eparm32[4]; # endif /* eparm is also used by AFSCALL_CALL in afsd.c */ @@ -506,7 +506,7 @@ Afs_syscall() return (ENODEV); } #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* setup uap for use below - pull out the magic decoder ring to know * which syscalls have folded argument lists. */ @@ -515,7 +515,7 @@ Afs_syscall() uap->parm2 = parm2; uap->parm3 = parm3; if (syscall == AFSCALL_ICL || syscall == AFSCALL_CALL) { -#ifdef AFS_SPARC64_LINUX24_ENV +#ifdef AFS_SPARC64_LINUX_ENV /* from arch/sparc64/kernel/sys_sparc32.c */ #define AA(__x) \ ({ unsigned long __ret; \ @@ -526,7 +526,7 @@ Afs_syscall() }) -#ifdef AFS_SPARC64_LINUX26_ENV +#ifdef AFS_SPARC64_LINUX_ENV if (test_thread_flag(TIF_32BIT)) #else if (current->thread.flags & SPARC_FLAG_32BIT) @@ -782,7 +782,7 @@ Afs_syscall() uap->parm5, (long *)retval); #endif /* !AFS_NBSD40_ENV */ AFS_GUNLOCK(); -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV if (!code) { /* ICL commands can return values. */ code = -linux_ret; /* Gets negated again at exit below */ @@ -793,7 +793,7 @@ Afs_syscall() setuerror(code); #endif } -#endif /* !AFS_LINUX20_ENV */ +#endif /* !AFS_LINUX_ENV */ } else { #if defined(KERNEL_HAVE_UERROR) setuerror(EINVAL); @@ -808,7 +808,7 @@ Afs_syscall() } /* 32 bit procs */ #endif #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV code = -code; #endif return code; diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index e4a5196..8afc01d 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -18,7 +18,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif #include @@ -26,7 +26,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ @@ -712,7 +712,7 @@ afs_GCPAGs_perproc_func(afs_proc_t * pproc) afs_GCPAGs_cred_count++; pag = PagInCred(pcred); -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_LINUX22_ENV) +#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_LINUX_ENV) uid = (pag != NOPAG ? pag : afs_cr_uid(pcred)); #elif defined(AFS_SUN510_ENV) uid = (pag != NOPAG ? pag : crgetruid(pcred)); diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index d8fe112..c20a1c8 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -20,7 +20,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif #include @@ -28,7 +28,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 7a003d8..80ddfb4 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -61,7 +61,7 @@ afs_rwlock_t afs_xvcdirty; /*Lock: discon vcache dirty list mgmt */ afs_rwlock_t afs_xvcache; /*Lock: alloc new stat cache entries */ afs_rwlock_t afs_xvreclaim; /*Lock: entries reclaimed, not on free list */ afs_lock_t afs_xvcb; /*Lock: fids on which there are callbacks */ -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) static struct vcache *freeVCList; /*Free list for stat cache entries */ struct vcache *ReclaimedVCList; /*Reclaimed list for stat entries */ static struct vcache *Initial_freeVCList; /*Initial list for above */ @@ -173,7 +173,7 @@ afs_FlushVCache(struct vcache *avc, int *slept) code = EBUSY; goto bad; } -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) if (avc->nextfree || !avc->vlruq.prev || !avc->vlruq.next) { /* qv afs.h */ refpanic("LRU vs. Free inconsistency"); } @@ -202,7 +202,7 @@ afs_FlushVCache(struct vcache *avc, int *slept) /* remove entry from the volume hash table */ QRemove(&avc->vhashq); -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) { struct pagewriter *pw, *store; struct list_head tofree; @@ -273,7 +273,7 @@ afs_FlushVCache(struct vcache *avc, int *slept) afs_evenZaps++; afs_vcount--; -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) /* put the entry in the free list */ avc->nextfree = freeVCList; freeVCList = avc; @@ -294,7 +294,7 @@ afs_FlushVCache(struct vcache *avc, int *slept) } else osi_Panic("flush vc refcnt < 1"); } -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ return 0; bad: @@ -684,7 +684,7 @@ afs_RemoveVCB(struct VenusFid *afid) void afs_FlushReclaimedVcaches(void) { -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) struct vcache *tvc; int code, fv_slept; struct vcache *tmpReclaimedVCList = NULL; @@ -760,7 +760,7 @@ afs_PostPopulateVCache(struct vcache *avc, struct VenusFid *afid, int seq) * * Returns 1 if the stat cache looks stressed, and 0 otherwise. */ -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV int afs_VCacheStressed(void) { @@ -789,7 +789,7 @@ afs_VCacheStressed(void) return 0; } } -#else /* AFS_LINUX26_ENV */ +#else /* AFS_LINUX_ENV */ int afs_VCacheStressed(void) { @@ -800,7 +800,7 @@ afs_VCacheStressed(void) } return 1; } -#endif /* AFS_LINUX26_ENV */ +#endif /* AFS_LINUX_ENV */ int afs_ShakeLooseVCaches(afs_int32 anumber) @@ -1050,7 +1050,7 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq) afs_FlushReclaimedVcaches(); -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) if(!afsd_dynamic_vcaches && afs_vcount >= afs_maxvcount) { afs_ShakeLooseVCaches(anumber); if (afs_vcount >= afs_maxvcount) { @@ -1062,7 +1062,7 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq) if (tvc == NULL) { return NULL; } -#else /* AFS_LINUX22_ENV */ +#else /* AFS_LINUX_ENV */ /* pull out a free cache entry */ if (!freeVCList) { afs_ShakeLooseVCaches(anumber); @@ -1080,7 +1080,7 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq) afs_vcount++; /* balanced by FlushVCache */ } /* end of if (!freeVCList) */ -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ #if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) if (tvc->v) @@ -1122,7 +1122,7 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq) * we have to do this after attaching the vnode, because the reference * count may be held in the vnode itself */ -#if defined(AFS_LINUX22_ENV) +#if defined(AFS_LINUX_ENV) /* Hold it for the LRU (should make count 2) */ osi_Assert(osi_vnhold(tvc) == 0); #elif !(defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)) @@ -2916,21 +2916,21 @@ afs_NFSFindVCache(struct vcache **avcp, struct VenusFid *afid) void afs_vcacheInit(int astatSize) { -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) struct vcache *tvp; #endif int i; if (!afs_maxvcount) { afs_maxvcount = astatSize; /* no particular limit on linux? */ } -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) freeVCList = NULL; #endif AFS_RWLOCK_INIT(&afs_xvcache, "afs_xvcache"); LOCK_INIT(&afs_xvcb, "afs_xvcb"); -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) /* Allocate and thread the struct vcache entries */ tvp = afs_osi_Alloc(astatSize * sizeof(struct vcache)); osi_Assert(tvp != NULL); @@ -3056,7 +3056,7 @@ shutdown_vcache(void) } afs_cbrSpace = 0; -#if !defined(AFS_LINUX22_ENV) +#if !defined(AFS_LINUX_ENV) afs_osi_Free(Initial_freeVCList, afs_cacheStats * sizeof(struct vcache)); # ifdef KERNEL_HAVE_PIN diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index 28179db..1f4a7b6 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -23,7 +23,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif #include @@ -31,7 +31,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ diff --git a/src/afs/afs_warn.c b/src/afs/afs_warn.c index ba0b757..074e53f 100644 --- a/src/afs/afs_warn.c +++ b/src/afs/afs_warn.c @@ -21,7 +21,7 @@ #if !defined(UKERNEL) -#if !defined(AFS_LINUX20_ENV) +#if !defined(AFS_LINUX_ENV) # include # if defined(AFS_SUN5_ENV) # include @@ -36,7 +36,7 @@ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include #endif /* ! AFS_HPUX110_ENV */ #endif /* !defined(UKERNEL) */ @@ -55,11 +55,11 @@ #include #endif -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) # define afs_vprintf(fmt, ap) vprintk(fmt, ap) #elif defined(AFS_SGI_ENV) # define afs_vprintf(fmt, ap) icmn_err(CE_WARN, fmt, ap) -#elif (defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV)) || (defined(AFS_LINUX22_ENV)) +#elif (defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV)) || (defined(AFS_LINUX_ENV)) static_inline void afs_vprintf(const char *fmt, va_list ap) { @@ -230,14 +230,14 @@ afs_warnall(char *fmt, ...) { va_list ap; -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV AFS_STATCNT(afs_warn); if ((afs_showflags & GAGCONSOLE) || (afs_showflags & GAGUSER)) { va_start(ap, fmt); afs_vwarn(fmt, ap); va_end(ap); } -# else /* AFS_LINUX20_ENV */ +# else /* AFS_LINUX_ENV */ AFS_STATCNT(afs_warn); if (afs_showflags & GAGCONSOLE) { va_start(ap, fmt); @@ -251,7 +251,7 @@ afs_warnall(char *fmt, ...) afs_vwarnuser(fmt, ap); va_end(ap); } -# endif /* AFS_LINUX20_ENV */ +# endif /* AFS_LINUX_ENV */ } #endif /* AFS_AIX_ENV */ diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h index 3d0286e..1a4369e 100644 --- a/src/afs/afsincludes.h +++ b/src/afs/afsincludes.h @@ -23,7 +23,7 @@ # elif defined(AFS_HPUX_ENV) || defined(AFS_NBSD_ENV) # include "osi_vfs.h" # endif -# if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) +# if defined(AFS_SGI_ENV) || defined(AFS_LINUX_ENV) # include "osi_vfs.h" # endif # include "rx/rx.h" @@ -31,13 +31,13 @@ # include "afs/lock.h" # include "afs/volerrors.h" # include "afs/voldefs.h" -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # ifdef TRUE # undef TRUE # undef FALSE # endif # endif -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # undef __NFDBITS # undef __FDMASK # endif @@ -54,7 +54,7 @@ # include "afs/afs_stats.h" # include "afs/afs_prototypes.h" # include "afs/discon.h" -# if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +# if defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) # include "osi_machdep.h" # endif diff --git a/src/afs/lock.h b/src/afs/lock.h index 9df8b99..dc7744b 100644 --- a/src/afs/lock.h +++ b/src/afs/lock.h @@ -80,7 +80,7 @@ typedef unsigned int afs_lock_tracker_t; # define MyPidxx current_pid() # define MyPidxx2Pid(x) (x) # endif -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) typedef struct task_struct * afs_lock_tracker_t; # define MyPidxx (current) # define MyPidxx2Pid(x) (x? (x)->pid : 0) diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 1f281c5..3e3e015 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -108,7 +108,7 @@ # include # include -#elif defined(AFS_LINUX22_ENV) +#elif defined(AFS_LINUX_ENV) # include # ifdef HAVE_LINUX_CONFIG_H # include @@ -121,7 +121,7 @@ # include # include # include -# if defined(AFS_LINUX26_ENV) +# if defined(AFS_LINUX_ENV) # include # include # include @@ -177,11 +177,11 @@ struct xfs_inode_info { # if defined(HAVE_LINUX_EXPORTFS_H) # include # endif -# ifdef AFS_LINUX24_ENV +# ifdef AFS_LINUX_ENV # include # endif -#else /* AFS_LINUX22_ENV */ +#else /* AFS_LINUX_ENV */ # include "h/errno.h" # include "h/types.h" @@ -449,7 +449,7 @@ MALLOC_DECLARE(M_AFS); # include # endif -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ #endif /* __AFS_SYSINCLUDESH__ so idempotent */ diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 5c714d0..afbef95 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -306,7 +306,7 @@ int *dir_for_V = NULL; /* Array: dir of each cache file. * -2: file exists in top-level * >=0: file exists in Dxxx */ -#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX_ENV) AFSD_INO_T *inode_for_V; /* Array of inodes for desired * cache files */ #endif @@ -1047,7 +1047,7 @@ doSweepAFSCache(int *vFilesFound, * file's inode, directory, and bump the number of files found * total and in this directory. */ -#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX_ENV) inode_for_V[vFileNum] = currp->d_ino; #endif dir_for_V[vFileNum] = dirNum; /* remember this directory */ @@ -1131,7 +1131,7 @@ doSweepAFSCache(int *vFilesFound, SetNoBackupAttr(fullpn_CellInfoFile); } else if ((strcmp(currp->d_name, ".") == 0) || (strcmp(currp->d_name, "..") == 0) || -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV /* this is the ext3 journal file */ (strcmp(currp->d_name, ".journal") == 0) || #endif @@ -1182,7 +1182,7 @@ doSweepAFSCache(int *vFilesFound, vFileNum); else { struct stat statb; -#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX_ENV) assert(inode_for_V[vFileNum] == (AFSD_INO_T) 0); #endif sprintf(vFilePtr, "D%d/V%d", thisDir, vFileNum); @@ -1195,7 +1195,7 @@ doSweepAFSCache(int *vFilesFound, if (CreateCacheFile(fullpn_VFile, &statb)) printf("%s: Can't create '%s'\n", rn, fullpn_VFile); else { -#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX_ENV) inode_for_V[vFileNum] = statb.st_ino; #endif dir_for_V[vFileNum] = thisDir; @@ -1289,7 +1289,7 @@ CheckCacheBaseDir(char *dir) /* might want to check here for anything else goofy, like cache pointed at a non-dedicated directory, etc */ -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV { int res; struct statfs statfsbuf; @@ -1298,7 +1298,7 @@ CheckCacheBaseDir(char *dir) if (res != 0) { return "unable to statfs cache base directory"; } -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) if (statfsbuf.f_type == 0x52654973) { /* REISERFS_SUPER_MAGIC */ return "cannot use reiserfs as cache partition"; } else if (statfsbuf.f_type == 0x58465342) { /* XFS_SUPER_MAGIC */ @@ -2558,7 +2558,7 @@ afsd_run(void) cacheStatEntries); } -#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX26_ENV) +#if !defined(AFS_CACHE_VNODE_PATH) && !defined(AFS_LINUX_ENV) /* * Create and zero the inode table for the desired cache files. */ @@ -2953,7 +2953,7 @@ afsd_run(void) } /* fall through to setup-by-inode */ } -#if defined(AFS_SGI62_ENV) || !(defined(AFS_LINUX26_ENV) || defined(AFS_CACHE_VNODE_PATH)) +#if defined(AFS_SGI62_ENV) || !(defined(AFS_LINUX_ENV) || defined(AFS_CACHE_VNODE_PATH)) afsd_syscall(AFSOP_CACHEINODE, inode_for_V[currVFile]); #else printf diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c index a9df9b6..a973dc7 100644 --- a/src/afsd/afsd_kernel.c +++ b/src/afsd/afsd_kernel.c @@ -31,7 +31,7 @@ #include #include -#if defined(AFS_LINUX20_ENV) +#if defined(AFS_LINUX_ENV) #include #endif @@ -113,7 +113,7 @@ kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int, # define SET_AFSD_RTPRI() SET_RTPRI(68) # define SET_RX_RTPRI() SET_RTPRI(199) #else -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # define SET_AFSD_RTPRI() # define SET_RX_RTPRI() do { \ if (setpriority(PRIO_PROCESS, 0, -10) < 0) \ @@ -203,7 +203,7 @@ afsd_set_afsd_rtpri(void) SET_AFSD_RTPRI(); } -#if defined(AFS_LINUX20_ENV) +#if defined(AFS_LINUX_ENV) int os_syscall(struct afsd_syscall_args *args) { @@ -475,9 +475,9 @@ vmountdata(struct vmount * vmtp, char *obj, char *stub, char *host, static int HandleMTab(char *cacheMountDir) { -#if (defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV)) +#if (defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX_ENV)) FILE *tfilep; -#if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) +#if defined(AFS_SGI_ENV) || defined(AFS_LINUX_ENV) struct mntent tmntent; char *dir; int i; @@ -591,7 +591,7 @@ afsd_mount_afs(const char *rn, const char *cacheMountDir) mountFlags = MS_FSS; if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, (caddr_t) MOUNT_AFS)) < 0) { -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) if ((mount("AFS", cacheMountDir, MOUNT_AFS, 0, NULL)) < 0) { #elif defined(AFS_NBSD50_ENV) if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, NULL, 0)) < 0) { diff --git a/src/auth/ktc.c b/src/auth/ktc.c index c04bc86..84879ef 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -50,7 +50,7 @@ #include #endif -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) #include #if defined(SYS_keyctl) /* Open code this value to avoid a dependency on keyutils */ @@ -297,7 +297,7 @@ SetToken(struct ktc_principal *aserver, struct ktc_token *atoken, #endif /* NO_AFS_CLIENT */ if (code) return KTC_PIOCTLFAIL; -#if defined(AFS_LINUX26_ENV) && defined(SYS_keyctl) +#if defined(AFS_LINUX_ENV) && defined(SYS_keyctl) else /* * If we're using keyring based PAGs and the SESSION_TO_PARENT keyctl @@ -372,7 +372,7 @@ ktc_SetTokenEx(struct ktc_setTokenData *token) { if (code) return KTC_PIOCTLFAIL; -#if defined(AFS_LINUX26_ENV) && defined(SYS_keyctl) +#if defined(AFS_LINUX_ENV) && defined(SYS_keyctl) else /* * If we're using keyring based PAGs and the SESSION_TO_PARENT keyctl diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index 9dab6d0..b97fea5 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -774,7 +774,7 @@ hdl_notifier(struct bnode_proc *tp) setsid(); #elif defined(AFS_DARWIN90_ENV) setpgid(0, 0); -#elif defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) +#elif defined(AFS_LINUX_ENV) || defined(AFS_AIX_ENV) setpgrp(); #else setpgrp(0, 0); diff --git a/src/butc/afsxbsa.c b/src/butc/afsxbsa.c index aee6b48..d8ec545 100644 --- a/src/butc/afsxbsa.c +++ b/src/butc/afsxbsa.c @@ -17,7 +17,7 @@ #include -#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) #include #endif @@ -630,9 +630,9 @@ void * dynlib = NULL ; #endif #if defined(AFS_AIX_ENV) dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER); -#elif defined (AFS_AMD64_LINUX26_ENV) +#elif defined (AFS_AMD64_LINUX_ENV) dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL); -#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) +#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL); #else dynlib = NULL; @@ -646,7 +646,7 @@ void * dynlib = NULL ; #ifdef DEBUG_BUTC printf("dsm_MountLibrary : SUCCESS to Open the libApiDS shared library. \n"); #endif -#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) AFSdsmBeginQuery = (dsInt16_t (*)( dsUint32_t dsmHandle, dsmQueryType queryType, dsmQueryBuff *queryBuffer)) dlsym((void *)dynlib, "dsmBeginQuery"); AFSdsmGetNextQObj = (dsInt16_t (*)( dsUint32_t dsmHandle, DataBlk *dataBlkPtr))dlsym((void *)dynlib, "dsmGetNextQObj") ; AFSdsmEndQuery = (dsInt16_t (*)( dsUint32_t dsmHandle))dlsym((void *)dynlib, "dsmEndQuery"); diff --git a/src/butc/butc_xbsa.c b/src/butc/butc_xbsa.c index f2da6a6..f45f610 100644 --- a/src/butc/butc_xbsa.c +++ b/src/butc/butc_xbsa.c @@ -229,7 +229,7 @@ xbsa_MountLibrary(struct butx_transactionInfo *info, afs_int32 serverType) XBSAQueryApiVersion(&(info->apiVersion)); #endif #else -#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) +#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) XBSAInit = BSAInit; XBSABeginTxn = BSABeginTxn; XBSAEndTxn = BSAEndTxn; diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index fd4c8d7..7f063db 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -676,7 +676,7 @@ incPosition(struct butm_tapeInfo *info, usd_handle_t fid, afs_uint32 dataSize) if (info->posCount >= 2147467264) { /* 2GB - 16K */ info->posCount = 0; -#if (defined(AFS_SUN_ENV) || defined(AFS_LINUX24_ENV)) +#if (defined(AFS_SUN_ENV) || defined(AFS_LINUX_ENV)) if (!isafile) { afs_int64 off; diff --git a/src/config/afs_args.h b/src/config/afs_args.h index 5588b9b..d173a12 100644 --- a/src/config/afs_args.h +++ b/src/config/afs_args.h @@ -241,7 +241,7 @@ typedef struct cm_initparams_v1 { /* Defines and structures for the AFS proc replacement layer for the original syscall (AFS_SYSCALL) strategy */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #define PROC_FSDIRNAME "openafs" #define PROC_SYSCALL_NAME "afs_ioctl" diff --git a/src/config/param.alpha_linux_26.h b/src/config/param.alpha_linux_26.h index 62ffd99..55ae09f 100644 --- a/src/config/param.alpha_linux_26.h +++ b/src/config/param.alpha_linux_26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_ALPHA_LINUX20_ENV 1 -#define AFS_ALPHA_LINUX22_ENV 1 -#define AFS_ALPHA_LINUX24_ENV 1 -#define AFS_ALPHA_LINUX26_ENV 1 +#define AFS_ALPHA_LINUX_ENV 1 #define __alpha 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ diff --git a/src/config/param.amd64_linux26.h b/src/config/param.amd64_linux26.h index c14657a..09e5287 100644 --- a/src/config/param.amd64_linux26.h +++ b/src/config/param.amd64_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_AMD64_LINUX20_ENV 1 -#define AFS_AMD64_LINUX22_ENV 1 -#define AFS_AMD64_LINUX24_ENV 1 -#define AFS_AMD64_LINUX26_ENV 1 +#define AFS_AMD64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.arm64_linux26.h b/src/config/param.arm64_linux26.h index 02e867a..fa5b39f1 100644 --- a/src/config/param.arm64_linux26.h +++ b/src/config/param.arm64_linux26.h @@ -13,7 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_ARM64_LINUX26_ENV 1 +#define AFS_ARM64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.arm_linux26.h b/src/config/param.arm_linux26.h index 1339fd0..2b32488 100644 --- a/src/config/param.arm_linux26.h +++ b/src/config/param.arm_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_ARM_LINUX20_ENV 1 -#define AFS_ARM_LINUX22_ENV 1 -#define AFS_ARM_LINUX24_ENV 1 -#define AFS_ARM_LINUX26_ENV 1 +#define AFS_ARM_LINUX_ENV 1 #else /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_linux26.h b/src/config/param.i386_linux26.h index 35ff066..48ad0b9 100644 --- a/src/config/param.i386_linux26.h +++ b/src/config/param.i386_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_I386_LINUX20_ENV 1 -#define AFS_I386_LINUX22_ENV 1 -#define AFS_I386_LINUX24_ENV 1 -#define AFS_I386_LINUX26_ENV 1 +#define AFS_I386_LINUX_ENV 1 #else /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_umlinux26.h b/src/config/param.i386_umlinux26.h index 8b70ae6..090c355 100644 --- a/src/config/param.i386_umlinux26.h +++ b/src/config/param.i386_umlinux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_I386_LINUX20_ENV 1 -#define AFS_I386_LINUX22_ENV 1 -#define AFS_I386_LINUX24_ENV 1 -#define AFS_I386_LINUX26_ENV 1 +#define AFS_I386_LINUX_ENV 1 #else /* !defined(UKERNEL) */ diff --git a/src/config/param.ia64_linux26.h b/src/config/param.ia64_linux26.h index 04e3fd7..402af6a 100644 --- a/src/config/param.ia64_linux26.h +++ b/src/config/param.ia64_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_IA64_LINUX20_ENV 1 -#define AFS_IA64_LINUX22_ENV 1 -#define AFS_IA64_LINUX24_ENV 1 -#define AFS_IA64_LINUX26_ENV 1 +#define AFS_IA64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.linux26.h b/src/config/param.linux26.h index b281e0a..ab13064 100644 --- a/src/config/param.linux26.h +++ b/src/config/param.linux26.h @@ -15,10 +15,7 @@ /* This section for kernel libafs compiles only */ #include -#define AFS_LINUX20_ENV 1 -#define AFS_LINUX22_ENV 1 -#define AFS_LINUX24_ENV 1 -#define AFS_LINUX26_ENV 1 +#define AFS_LINUX_ENV 1 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ @@ -64,10 +61,8 @@ #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_LINUX20_ENV 1 -#define AFS_USR_LINUX22_ENV 1 -#define AFS_USR_LINUX24_ENV 1 -#define AFS_USR_LINUX26_ENV 1 + +#define AFS_USR_LINUX_ENV 1 #define AFS_ENV 1 #define AFS_64BIT_CLIENT 1 diff --git a/src/config/param.ppc64_linux26.h b/src/config/param.ppc64_linux26.h index 3c83386..3ac7d3d 100644 --- a/src/config/param.ppc64_linux26.h +++ b/src/config/param.ppc64_linux26.h @@ -12,10 +12,7 @@ #ifndef UKERNEL /* This section for kernel space compiles only */ -#define AFS_PPC64_LINUX20_ENV 1 -#define AFS_PPC64_LINUX22_ENV 1 -#define AFS_PPC64_LINUX24_ENV 1 -#define AFS_PPC64_LINUX26_ENV 1 +#define AFS_PPC64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.ppc64le_linux26.h b/src/config/param.ppc64le_linux26.h index 9c8b822..ca3aba8 100644 --- a/src/config/param.ppc64le_linux26.h +++ b/src/config/param.ppc64le_linux26.h @@ -12,10 +12,7 @@ #ifndef UKERNEL /* This section for kernel space compiles only */ -#define AFS_PPC64_LINUX20_ENV 1 -#define AFS_PPC64_LINUX22_ENV 1 -#define AFS_PPC64_LINUX24_ENV 1 -#define AFS_PPC64_LINUX26_ENV 1 +#define AFS_PPC64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.ppc_linux26.h b/src/config/param.ppc_linux26.h index fd6ee45..60fcb28 100644 --- a/src/config/param.ppc_linux26.h +++ b/src/config/param.ppc_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_PPC_LINUX20_ENV 1 -#define AFS_PPC_LINUX22_ENV 1 -#define AFS_PPC_LINUX24_ENV 1 -#define AFS_PPC_LINUX26_ENV 1 +#define AFS_PPC_LINUX_ENV 1 #else /* !defined(UKERNEL) */ diff --git a/src/config/param.s390_linux26.h b/src/config/param.s390_linux26.h index 6757c4c..cd2ba4d 100644 --- a/src/config/param.s390_linux26.h +++ b/src/config/param.s390_linux26.h @@ -13,10 +13,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_S390_LINUX20_ENV 1 -#define AFS_S390_LINUX22_ENV 1 -#define AFS_S390_LINUX24_ENV 1 -#define AFS_S390_LINUX26_ENV 1 +#define AFS_S390_LINUX_ENV 1 #else /* !defined(UKERNEL) */ diff --git a/src/config/param.s390x_linux26.h b/src/config/param.s390x_linux26.h index 1606c23..cc65dbd 100644 --- a/src/config/param.s390x_linux26.h +++ b/src/config/param.s390x_linux26.h @@ -13,14 +13,8 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_S390_LINUX20_ENV 1 -#define AFS_S390_LINUX22_ENV 1 -#define AFS_S390_LINUX24_ENV 1 -#define AFS_S390_LINUX26_ENV 1 -#define AFS_S390X_LINUX20_ENV 1 -#define AFS_S390X_LINUX22_ENV 1 -#define AFS_S390X_LINUX24_ENV 1 -#define AFS_S390X_LINUX26_ENV 1 +#define AFS_S390_LINUX_ENV 1 +#define AFS_S390X_LINUX_ENV 1 #define AFS_64BITPOINTER_ENV 1 #define AFS_64BITUSERPOINTER_ENV 1 @@ -30,10 +24,7 @@ /* This section for user space compiles only */ #define UKERNEL 1 /* user space kernel */ -#define AFS_S390X_LINUX20_ENV 1 -#define AFS_S390X_LINUX22_ENV 1 -#define AFS_S390X_LINUX24_ENV 1 -#define AFS_S390X_LINUX26_ENV 1 +#define AFS_S390X_LINUX_ENV 1 #define AFS_64BITPOINTER_ENV 1 #define AFS_64BITUSERPOINTER_ENV 1 diff --git a/src/config/param.sparc64_linux26.h b/src/config/param.sparc64_linux26.h index c51b66d..9e90cba 100644 --- a/src/config/param.sparc64_linux26.h +++ b/src/config/param.sparc64_linux26.h @@ -12,10 +12,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_SPARC64_LINUX20_ENV 1 -#define AFS_SPARC64_LINUX22_ENV 1 -#define AFS_SPARC64_LINUX24_ENV 1 -#define AFS_SPARC64_LINUX26_ENV 1 +#define AFS_SPARC64_LINUX_ENV 1 #define AFS_LINUX_64BIT_KERNEL 1 #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #define AFS_32BIT_USR_ENV 1 /* user level processes are 32bit */ diff --git a/src/config/param.sparc_linux26.h b/src/config/param.sparc_linux26.h index 349907e..82dd98d 100644 --- a/src/config/param.sparc_linux26.h +++ b/src/config/param.sparc_linux26.h @@ -12,9 +12,7 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_SPARC_LINUX20_ENV 1 -#define AFS_SPARC_LINUX22_ENV 1 -#define AFS_SPARC_LINUX24_ENV 1 +#define AFS_SPARC_LINUX_ENV 1 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #if defined(AFS_SMP) && defined(CONFIG_MODVERSIONS) diff --git a/src/config/stds.h b/src/config/stds.h index 254856d..b6f30e5 100644 --- a/src/config/stds.h +++ b/src/config/stds.h @@ -307,7 +307,7 @@ hdr_static_inline(unsigned long long) afs_printable_uint64_lu(afs_uint64 d) { re # define AFS_NONNULL(x) #endif -#if defined(AFS_LINUX26_ENV) && defined(fallthrough) +#if defined(AFS_LINUX_ENV) && defined(fallthrough) # define AFS_FALLTHROUGH fallthrough #elif defined(HAVE_FUNC_ATTRIBUTE_FALLTHROUGH) # define AFS_FALLTHROUGH __attribute__((fallthrough)) diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h index ef89ed4..9623fa9 100644 --- a/src/crypto/hcrypto/kernel/config.h +++ b/src/crypto/hcrypto/kernel/config.h @@ -102,7 +102,7 @@ static_inline int close(int d) {return -1;} # undef HAVE_ARC4RANDOM #endif -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) /* * gettimeofday is only used in rand-fortuna.c, not built for Linux. * Linux 5.6 removes the native struct timeval, so this stub would not build. @@ -111,7 +111,7 @@ static_inline int gettimeofday(struct timeval *tp, void *tzp) {if (tp == NULL) return -1; tp->tv_sec = osi_Time(); tp->tv_usec = 0; return 0;} #endif -#if defined(KERNEL) && (defined(AFS_SUN5_ENV) || defined(AFS_ARM64_LINUX26_ENV)) +#if defined(KERNEL) && (defined(AFS_SUN5_ENV) || defined(AFS_ARM64_LINUX_ENV)) /* * Some functions such as RAND_add take a 'double' as an argument, but floating * point code generally cannot be used in kernelspace. We never actually use diff --git a/src/dir/dir.c b/src/dir/dir.c index 00e7ea6..8872cbe 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -13,7 +13,7 @@ #ifdef KERNEL # if !defined(UKERNEL) # include "h/types.h" -# if !defined(AFS_LINUX26_ENV) +# if !defined(AFS_LINUX_ENV) # include "h/param.h" # endif # ifdef AFS_AUX_ENV @@ -24,10 +24,10 @@ # include "h/errno.h" # endif # include "h/time.h" -# if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) +# if defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) # include "h/errno.h" # else -# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) +# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) # include "h/kernel.h" # endif # endif @@ -38,10 +38,10 @@ # include "h/user.h" # endif /* AFS_SGI64_ENV */ # include "h/uio.h" -# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) +# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_HPUX110_ENV) # include "h/mbuf.h" # endif -# ifndef AFS_LINUX20_ENV +# ifndef AFS_LINUX_ENV # include "netinet/in.h" # endif # else /* !defined(UKERNEL) */ @@ -60,7 +60,7 @@ extern int DNew(struct dcache *adc, int page, struct DirBuffer *); # include "afs/dir.h" -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # include "h/string.h" # endif diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index 0c20017..6330302 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -20,7 +20,7 @@ #include -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_FBSD_ENV) #include #endif diff --git a/src/kauth/kalog.h b/src/kauth/kalog.h index 2a0801e..f572a82 100644 --- a/src/kauth/kalog.h +++ b/src/kauth/kalog.h @@ -30,7 +30,7 @@ typedef struct { #define LOG_TGTREQUEST 8 #ifdef AUTH_DBM_LOG -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include #define dbm_store gdbm_store #define dbm_firstkey gdbm_firstkey @@ -41,7 +41,7 @@ typedef struct { #define DBM GDBM_FILE #define DBM_REPLACE GDBM_REPLACE -#else /* AFS_LINUX20_ENV */ +#else /* AFS_LINUX_ENV */ #include #define afs_dbm_nextkey(d, k) dbm_nextkey(d) #endif diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index 14f793a..4ddebde 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -55,7 +55,7 @@ struct afsconf_dir *KA_conf; /* for getting cell info */ int MinHours = 0; int npwSums = KA_NPWSUMS; /* needs to be variable sometime */ -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #undef vfprintf #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream) #endif diff --git a/src/kauth/kauth.rg b/src/kauth/kauth.rg index 80e5b11..87fce62 100644 --- a/src/kauth/kauth.rg +++ b/src/kauth/kauth.rg @@ -71,7 +71,7 @@ const KAMINORVERSION = 2; * On Linux, dbm is not part of the standard installation, and we can't * statically link it in. So, ignore it for now. */ -%#if !defined(AFS_HPUX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) +%#if !defined(AFS_HPUX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) %#define AUTH_DBM_LOG %#endif diff --git a/src/kauth/user.c b/src/kauth/user.c index 14cd1b0..c913741 100644 --- a/src/kauth/user.c +++ b/src/kauth/user.c @@ -163,7 +163,7 @@ ka_UserAuthenticateGeneral(afs_int32 flags, char *name, char *instance, } #endif -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && (!defined(AFS_XBSD_ENV) || defined(AFS_FBSD_ENV)) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_USR_LINUX_ENV) && (!defined(AFS_XBSD_ENV) || defined(AFS_FBSD_ENV)) /* handle smoothly the case where no AFS system calls exists (yet) */ (void)signal(SIGSYS, SIG_IGN); #endif diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 3647a4d..4dd185a 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -22,7 +22,7 @@ ifeq (${SYS_NAME}, ppc64_linux26) UAFS_CFLAGS=-fPIC endif -TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV $(XCFLAGS) +TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX_ENV $(XCFLAGS) TEST_LDFLAGS= TEST_LIBS=-lpthread @LIB_crypt@ diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c index 670fd29..1251d06 100644 --- a/src/lwp/iomgr.c +++ b/src/lwp/iomgr.c @@ -201,7 +201,7 @@ static struct IoRequest *NewRequest(void) /* On Linux without __USE_XOPEN, we have __fds_bits. With __USE_XOPEN, or * non-Linux, we have fds_bits. */ -#if defined(AFS_LINUX22_ENV) && (__GLIBC_MINOR__ > 0) && !defined(__USE_XOPEN) +#if defined(AFS_LINUX_ENV) && (__GLIBC_MINOR__ > 0) && !defined(__USE_XOPEN) # define FDS_BITS __fds_bits #else # define FDS_BITS fds_bits @@ -473,7 +473,7 @@ static void *IOMGR(void *dummy) iomgr_timeout.tv_sec = 100000000; iomgr_timeout.tv_usec = 0; } -#if defined(AFS_NT40_ENV) || defined(AFS_LINUX24_ENV) +#if defined(AFS_NT40_ENV) || defined(AFS_LINUX_ENV) /* On NT, signals don't interrupt a select call. So this can potentially * lead to long wait times before a signal is honored. To avoid this we * dont do select() for longer than IOMGR_MAXWAITTIME (5 secs) */ @@ -565,7 +565,7 @@ static void *IOMGR(void *dummy) /* Real timeout only if signal handler hasn't set iomgr_timeout to zero. */ -#if defined(AFS_NT40_ENV) || defined(AFS_LINUX24_ENV) +#if defined(AFS_NT40_ENV) || defined(AFS_LINUX_ENV) /* On NT, real timeout only if above and if iomgr_timeout * interval is equal to timeout interval (i.e., not adjusted * to check for pseudo-signals). diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index 96bd6d3..9733d3f 100644 --- a/src/lwp/lwp.c +++ b/src/lwp/lwp.c @@ -33,8 +33,8 @@ int setlim(int limcon, uchar_t hard, int limit); #endif -#ifndef AFS_ARM_LINUX20_ENV -#if defined(AFS_S390_LINUX20_ENV) +#ifndef AFS_ARM_LINUX_ENV +#if defined(AFS_S390_LINUX_ENV) int PRE_Block; /* Remnants of preemption support. */ #else char PRE_Block; /* Remnants of preemption support. */ @@ -365,7 +365,7 @@ LWP_CreateProcess(void *(*ep) (void *), int stacksize, int priority, void *parm, Initialize_PCB(temp, priority, stackmemory, stacksize, ep, parm, name); insert(temp, &runnable[priority]); temp2 = lwp_cpptr; -#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) +#if !defined(AFS_ARM_LINUX_ENV) && !defined(AFS_ARM_DARWIN_ENV) if (PRE_Block != 0) Abort_LWP("PRE_Block not 0"); @@ -385,18 +385,18 @@ LWP_CreateProcess(void *(*ep) (void *), int stacksize, int priority, void *parm, savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - 16); /* 16 = 2 * jmp_buf_type */ #endif /* !sys_x86_darwin_80 */ #else -#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - 0x40); /* lomgjmp does something * with %fp + 0x38 */ #else -#if defined(AFS_S390_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - MINFRAME); -#else /* !AFS_S390_LINUX20_ENV */ +#else /* !AFS_S390_LINUX_ENV */ savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - sizeof(void *)); -#endif /* AFS_S390_LINUX20_ENV */ -#endif /* AFS_SPARC64_LINUX20_ENV || AFS_SPARC_LINUX20_ENV */ +#endif /* AFS_S390_LINUX_ENV */ +#endif /* AFS_SPARC64_LINUX_ENV || AFS_SPARC_LINUX_ENV */ #endif /* AFS_SGI62_ENV */ #endif /* End of gross hack */ @@ -456,7 +456,7 @@ LWP_CreateProcess2(void *(*ep) (void *), int stacksize, int priority, void *parm Initialize_PCB(temp, priority, stackptr, stacksize, ep, parm, name); insert(temp, &runnable[priority]); temp2 = lwp_cpptr; -#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) +#if !defined(AFS_ARM_LINUX_ENV) && !defined(AFS_ARM_DARWIN_ENV) if (PRE_Block != 0) Abort_LWP("PRE_Block not 0"); @@ -521,12 +521,12 @@ LWP_DestroyProcess(PROCESS pid) savecontext(Dispatcher, &(temp->context), &(LWPANCHOR. dsptchstack[(sizeof LWPANCHOR.dsptchstack) - 8])); -#elif defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) +#elif defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) savecontext(Dispatcher, &(temp->context), &(LWPANCHOR. dsptchstack[(sizeof LWPANCHOR.dsptchstack) - 0x40])); -#elif defined(AFS_S390_LINUX20_ENV) +#elif defined(AFS_S390_LINUX_ENV) savecontext(Dispatcher, &(temp->context), &(LWPANCHOR. dsptchstack[(sizeof LWPANCHOR.dsptchstack) - @@ -956,7 +956,7 @@ Dispatcher(void) printf("Dispatch %d [PCB at 0x%x] \"%s\"\n", ++dispatch_count, runnable[i].head, runnable[i].head->name); #endif -#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) +#if !defined(AFS_ARM_LINUX_ENV) && !defined(AFS_ARM_DARWIN_ENV) if (PRE_Block != 1) Abort_LWP("PRE_Block not 1"); #endif diff --git a/src/lwp/lwp.h b/src/lwp/lwp.h index 68d3d42..3c7e4bb 100644 --- a/src/lwp/lwp.h +++ b/src/lwp/lwp.h @@ -26,7 +26,7 @@ #ifndef _MFC_VER /*skip if doing Microsoft foundation class */ #include #endif -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) #include #include #include @@ -212,7 +212,7 @@ char lwp_debug; /* ON = show LWP debugging trace */ */ #if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H) #define AFS_LWP_MINSTACKSIZE (288 * 1024) -#elif defined(AFS_LINUX22_ENV) +#elif defined(AFS_LINUX_ENV) #define AFS_LWP_MINSTACKSIZE (192 * 1024) #else #define AFS_LWP_MINSTACKSIZE (48 * 1024) @@ -278,7 +278,7 @@ extern afs_int32 savecontext(void (*ep)(void), struct lwp_context *savearea, char *sp); extern void returnto(struct lwp_context *savearea); -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV /* max time we are allowed to spend in a select call on Linux to avoid lost signal issues */ #define IOMGR_MAXWAITTIME 60 /* seconds */ diff --git a/src/lwp/process.c b/src/lwp/process.c index c2ba28c..7130c3e 100644 --- a/src/lwp/process.c +++ b/src/lwp/process.c @@ -18,7 +18,7 @@ #include "lwp.h" -#if defined(AFS_S390_LINUX20_ENV) +#if defined(AFS_S390_LINUX_ENV) extern int PRE_Block; /* used in lwp.c and process.s */ #else extern char PRE_Block; /* used in lwp.c and process.s */ @@ -26,7 +26,7 @@ extern char PRE_Block; /* used in lwp.c and process.s */ #if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H) -# if defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV) +# if defined(AFS_LINUX_ENV) || defined(AFS_XBSD_ENV) # define AFS_UCONTEXT_NOSTACK # endif @@ -90,21 +90,21 @@ returnto(struct lwp_context *savearea) # endif #elif defined(AFS_HPUX_ENV) #define LWP_SP 1 -#elif defined(AFS_LINUX20_ENV) -#if defined(AFS_PPC_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) +#if defined(AFS_PPC_LINUX_ENV) || defined(AFS_PPC64_LINUX_ENV) #define LWP_SP 0 -#elif defined(AFS_I386_LINUX20_ENV) +#elif defined(AFS_I386_LINUX_ENV) #define LWP_SP 4 -#elif defined(AFS_S390_LINUX20_ENV) +#elif defined(AFS_S390_LINUX_ENV) #define LWP_SP 9 #define LWP_FP 5 -#elif defined(AFS_SPARC_LINUX20_ENV) +#elif defined(AFS_SPARC_LINUX_ENV) #define LWP_SP 0 #define LWP_FP 1 -#elif defined(AFS_SPARC64_LINUX20_ENV) && defined(AFS_32BIT_USR_ENV) +#elif defined(AFS_SPARC64_LINUX_ENV) && defined(AFS_32BIT_USR_ENV) #define LWP_SP 0 #define LWP_FP 1 -#elif defined(AFS_ALPHA_LINUX20_ENV) +#elif defined(AFS_ALPHA_LINUX_ENV) #define LWP_SP 8 #define LWP_FP 7 #else @@ -127,11 +127,11 @@ Need offset to SP in jmp_buf for this platform. typedef __uint64_t jmp_buf_type; #endif #else -#if defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV) +#if defined(AFS_ALPHA_LINUX_ENV) || defined(AFS_PPC64_LINUX_ENV) typedef long jmp_buf_type; #else typedef int jmp_buf_type; -#endif /*AFS_ALPHA_LINUX20_ENV */ +#endif /*AFS_ALPHA_LINUX_ENV */ #endif /*SGI*/ static jmp_buf jmp_tmp; @@ -143,12 +143,12 @@ static jmp_buf_type *jmpBuffer; * On Sparc ucontext functions are not implemented. */ #define ptr_mangle(x) (x) -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #ifdef __GLIBC__ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) -#if defined(AFS_SPARC64_LINUX24_ENV) || defined(AFS_SPARC_LINUX24_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) /* technically we should use POINTER_GUARD * ( == offsetof (tcbhead_t, pointer_guard) ) * instead of 0x18 @@ -202,7 +202,7 @@ savecontext(void (*ep)(void), struct lwp_context *savearea, char *sp) case 0: jmpBuffer = (jmp_buf_type *) jmp_tmp; jmpBuffer[LWP_SP] = ptr_mangle((jmp_buf_type) sp); -#if defined(AFS_S390_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || (defined(AFS_SPARC64_LINUX20_ENV) && defined(AFS_32BIT_USR_ENV)) +#if defined(AFS_S390_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) || (defined(AFS_SPARC64_LINUX_ENV) && defined(AFS_32BIT_USR_ENV)) jmpBuffer[LWP_FP] = ptr_mangle((jmp_buf_type) sp); #endif longjmp(jmp_tmp, 1); diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c index 11ef20b..aa77555 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -164,7 +164,7 @@ LWP_WaitForKeystroke(int seconds) #if defined(HAVE_STDIO_EXT_H) if (__fbufsize(stdin) > 0) return 1; -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) if (stdin->_IO_read_ptr < stdin->_IO_read_end) return 1; #elif (defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)) && defined(AFS_DFBSD_ENV) diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c index d41d2f0..e5992ad 100644 --- a/src/pam/afs_auth.c +++ b/src/pam/afs_auth.c @@ -66,7 +66,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, pid_t cpid, rcpid; int status; struct sigaction newAction, origAction; -#if !(defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) +#if !(defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) char upwd_buf[2048]; /* size is a guess. */ struct passwd unix_pwd; #endif @@ -187,7 +187,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, RET(PAM_AUTH_ERR); } #else -#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) upwd = getpwnam(user); #else upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c index 547e723..e2c072c 100644 --- a/src/pam/afs_password.c +++ b/src/pam/afs_password.c @@ -53,7 +53,7 @@ pam_sm_chauthtok(pam_handle_t * pamh, int flags, int argc, const char **argv) struct ubik_client *conn = 0; PAM_CONST struct pam_conv *pam_convp = NULL; struct passwd *upwd = NULL; -#if !(defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) +#if !(defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) char upwd_buf[2048]; /* size is a guess. */ struct passwd unix_pwd; #endif @@ -130,7 +130,7 @@ pam_sm_chauthtok(pam_handle_t * pamh, int flags, int argc, const char **argv) RET(PAM_AUTH_ERR); } #else -#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) upwd = getpwnam(user); #else upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/afs_session.c b/src/pam/afs_session.c index e4a3620..9b460a0 100644 --- a/src/pam/afs_session.c +++ b/src/pam/afs_session.c @@ -81,7 +81,7 @@ pam_sm_close_session(pam_handle_t * pamh, int flags, int argc, case -1: /* error */ return (PAM_SESSION_ERR); case 0: /* child */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV setpgrp(); #endif setsid(); diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c index 0bfbb85..f6c4fc4 100644 --- a/src/pam/afs_setcred.c +++ b/src/pam/afs_setcred.c @@ -57,7 +57,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) int password_expires = -1; char *reason = NULL; struct passwd *upwd = NULL; -#if !(defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) +#if !(defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV)) char upwd_buf[2048]; /* size is a guess. */ struct passwd unix_pwd; #endif @@ -165,7 +165,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) RET(PAM_AUTH_ERR); } #else -#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) upwd = getpwnam(user); #else upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/test_pam.c b/src/pam/test_pam.c index 1133c25..f557ae8 100644 --- a/src/pam/test_pam.c +++ b/src/pam/test_pam.c @@ -28,7 +28,7 @@ static const char *service = "afstest"; static const char *new_envstring = "GOTHEREVIATESTPAM=1"; static const char *new_homestring = "HOME=/tmp"; -#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) || defined(AFS_DARWIN_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DFBSD_ENV) || defined(AFS_NBSD_ENV) || defined(AFS_DARWIN_ENV) #define getpassphrase getpass #endif diff --git a/src/platform/IRIX/rcmd.c b/src/platform/IRIX/rcmd.c index 37ad40f..5bc93f6 100644 --- a/src/platform/IRIX/rcmd.c +++ b/src/platform/IRIX/rcmd.c @@ -87,7 +87,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p) #endif char **ahost; u_short rport; -#if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) const char *locuser, *remuser, *cmd; #else char *locuser, *remuser, *cmd; @@ -336,7 +336,7 @@ rresvport(alport) int _check_rhosts_file = 1; -#if defined(AFS_HPUX102_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_HPUX102_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) ruserok(rhost, superuser, ruser, luser) const char *rhost; int superuser; diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c index 7e14cf3..07046c1 100644 --- a/src/rx/UKERNEL/rx_knet.c +++ b/src/rx/UKERNEL/rx_knet.c @@ -227,7 +227,7 @@ rxk_InitializeSocket(void) len = sizeof(struct sockaddr_in); rc = getsockname(sock, (struct sockaddr *)&lcladdr, &len); usr_assert(rc >= 0); -#ifdef AFS_USR_LINUX22_ENV +#ifdef AFS_USR_LINUX_ENV optval0 = 131070; #else optval0 = 131072; @@ -240,7 +240,7 @@ rxk_InitializeSocket(void) rc = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (void *)&optval, &optlen); usr_assert(rc == 0); /* usr_assert(optval == optval0); */ -#ifdef AFS_USR_LINUX22_ENV +#ifdef AFS_USR_LINUX_ENV optval0 = 131070; #else optval0 = 131072; diff --git a/src/rx/rx.c b/src/rx/rx.c index 371c74a..dc56f17 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -19,7 +19,7 @@ # include "h/types.h" # include "h/time.h" # include "h/stat.h" -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # include "h/socket.h" # endif # include "netinet/in.h" diff --git a/src/rx/rx_atomic.h b/src/rx/rx_atomic.h index 72ee054..2979041 100644 --- a/src/rx/rx_atomic.h +++ b/src/rx/rx_atomic.h @@ -206,7 +206,7 @@ static_inline void rx_atomic_sub(rx_atomic_t *atomic, int change) { OSAtomicAdd32(0 - change, &atomic->var); } -#elif defined(AFS_LINUX26_ENV) && defined(KERNEL) +#elif defined(AFS_LINUX_ENV) && defined(KERNEL) #include typedef atomic_t rx_atomic_t; diff --git a/src/rx/rx_internal.h b/src/rx/rx_internal.h index afef972..99bf40c 100644 --- a/src/rx/rx_internal.h +++ b/src/rx/rx_internal.h @@ -6,7 +6,7 @@ */ #ifdef AFS_RXERRQ_ENV -# if defined(AFS_LINUX26_ENV) || defined(AFS_USR_LINUX26_ENV) +# if defined(AFS_LINUX_ENV) || defined(AFS_USR_LINUX_ENV) # include # include # include diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 57fd715..f249204 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -197,7 +197,7 @@ osi_utoa(char *buf, size_t len, unsigned long val) return 0; } -#ifndef AFS_LINUX26_ENV +#ifndef AFS_LINUX_ENV /* * osi_AssertFailK() -- used by the osi_Assert() macro. * @@ -250,7 +250,7 @@ osi_AssertFailK(const char *expr, const char *file, int line) osi_Panic("%s", buf); } -#endif /* !AFS_LINUX26_ENV */ +#endif /* !AFS_LINUX_ENV */ #ifndef UKERNEL /* This is the server process request loop. Kernel server @@ -464,7 +464,7 @@ rxi_InitPeerParams(struct rx_peer *pp) */ -#if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX20_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_XBSD_ENV) +#if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_XBSD_ENV) /* Routine called during the afsd "-shutdown" process to put things back to * the initial state. */ @@ -824,7 +824,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) * most of it is simple to follow common code. */ #if !defined(UKERNEL) -# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_SOCKPROXY_ENV) +# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_SOCKPROXY_ENV) /* rxk_NewSocket creates a new socket on the specified port. The port is * in network byte order. */ @@ -1044,7 +1044,7 @@ rxk_FreeSocket(struct socket *asocket) # endif return 0; } -# endif /* !SUN5 && !LINUX20 && !AFS_SOCKPROXY_ENV */ +# endif /* !AFS_SUN5_ENV && !AFS_LINUX_ENV && !AFS_SOCKPROXY_ENV */ # if defined(RXK_LISTENER_ENV) || defined(AFS_SUN5_ENV) || defined(RXK_UPCALL_ENV) # ifdef RXK_TIMEDSLEEP_ENV @@ -1218,7 +1218,7 @@ rxk_ReadPacket(osi_socket so, struct rx_packet *p, int *host, int *port) * OS's socket receive routine returns as a result of a signal. */ int rxk_ListenerPid; /* Used to signal process to wakeup at shutdown */ -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV struct task_struct *rxk_ListenerTask; # endif @@ -1229,7 +1229,7 @@ rxk_Listener(void) int code; int host, port; -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV rxk_ListenerPid = current->pid; rxk_ListenerTask = current; allow_signal(SIGKILL); /* Allowed, but blocked until shutdown */ @@ -1276,7 +1276,7 @@ rxk_Listener(void) osi_rxWakeup(&afs_termState); } rxk_ListenerPid = 0; -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV rxk_ListenerTask = 0; osi_rxWakeup(&rxk_ListenerTask); # endif @@ -1285,7 +1285,7 @@ rxk_Listener(void) # endif } -# if !defined(AFS_LINUX20_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) +# if !defined(AFS_LINUX_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) /* The manner of stopping the rx listener thread may vary. Most unix's should * be able to call soclose. */ @@ -1298,7 +1298,7 @@ osi_StopListener(void) # endif /* RXK_LISTENER_ENV */ #endif /* !UKERNEL */ -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) void # if defined(AFS_AIX_ENV) osi_Panic(char *msg, void *a1, void *a2, void *a3) @@ -1327,7 +1327,7 @@ osi_Panic(char *msg, ...) icmn_err(CE_PANIC, msg, ap); va_end(ap); } -# elif defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_FBSD_ENV) || defined(UKERNEL) +# elif defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV) || defined(UKERNEL) char buf[256]; va_list ap; if (!msg) @@ -1338,7 +1338,7 @@ osi_Panic(char *msg, ...) va_end(ap); printf("%s", buf); panic("%s", buf); -# else /* DARWIN80 || LINUX22 || FBSD || UKERNEL */ +# else /* DARWIN80 || LINUX || FBSD || UKERNEL */ va_list ap; if (!msg) msg = "Unknown AFS panic"; @@ -1346,12 +1346,12 @@ osi_Panic(char *msg, ...) va_start(ap, msg); vprintf(msg, ap); va_end(ap); -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV * ((char *) 0) = 0; # else panic("%s", msg); # endif -# endif /* else DARWIN80 || LINUX22 || FBSD || UKERNEL */ +# endif /* else DARWIN80 || LINUX || FBSD || UKERNEL */ } -#endif /* !AFS_LINUX26_ENV */ +#endif /* !AFS_LINUX_ENV */ diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index c5e6a43..18bca30 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -18,7 +18,7 @@ #ifndef _RX_KCOMMON_H_ #define _RX_KCOMMON_H_ -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #ifndef _LINUX_CODA_FS_I #define _LINUX_CODA_FS_I 1 #define _CODA_HEADER_ 1 @@ -29,10 +29,10 @@ struct coda_inode_info { #include "h/types.h" -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) #include "h/param.h" #endif -#ifndef AFS_LINUX22_ENV +#ifndef AFS_LINUX_ENV #include "h/systm.h" #endif #include "h/time.h" @@ -43,7 +43,7 @@ struct coda_inode_info { #include "h/disp.h" #endif #include "h/socket.h" -#if !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV) #include "h/socketvar.h" #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) #include "h/domain.h" @@ -68,7 +68,7 @@ struct coda_inode_info { #include "h/mbuf.h" #endif #endif /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */ -#endif /* !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) */ +#endif /* !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV) */ #ifdef AFS_SGI62_ENV #include "h/hashing.h" #endif @@ -83,32 +83,32 @@ struct coda_inode_info { #include "h/signalvar.h" #endif /* AFS_OBSD_ENV */ #include "netinet/in.h" -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #include "linux/route.h" #else #include "net/route.h" #endif -#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX22_ENV) +#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX_ENV) #include "netinet/in_systm.h" #endif #include "netinet/ip.h" -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) #include "netinet/in_pcb.h" -#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */ -#ifndef AFS_LINUX22_ENV +#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX_ENV */ +#ifndef AFS_LINUX_ENV #if !defined(AFS_DARWIN_ENV) #include "netinet/ip_var.h" #endif #include "netinet/ip_icmp.h" -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ #include "netinet/udp.h" -#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_SGI62_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/udp_var.h" #endif #if defined(AFS_HPUX102_ENV) || (defined(AFS_SGI62_ENV) && !defined(AFS_SGI64_ENV)) #include "h/user.h" #endif -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #include "h/sched.h" #include "h/netdevice.h" #include "linux/if.h" @@ -124,9 +124,9 @@ struct coda_inode_info { # include # endif #endif -#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) #include "netinet/in_var.h" -#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */ +#endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX_ENV */ #include "afs/afs_osi.h" #include "rx_kmutex.h" #include "afs/lock.h" diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index 1e7980d..947dd90 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -37,7 +37,7 @@ typedef struct socket *osi_socket; extern int osi_utoa(char *buf, size_t len, unsigned long val); -#if defined(AFS_LINUX26_ENV) +#if defined(AFS_LINUX_ENV) # define osi_Panic(msg...) \ do { printk(KERN_CRIT "openafs: " msg); BUG(); } while (0) # define osi_Assert(expr) \ @@ -58,7 +58,7 @@ extern void osi_Panic(char *fmt, ...) (void)((exp) || (osi_AssertFailK( #exp , __FILE__, __LINE__), 0)) #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV # define osi_Msg printk)( #else # define osi_Msg printf)( diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c index dfeb674..5768af2 100644 --- a/src/rx/rx_lwp.c +++ b/src/rx/rx_lwp.c @@ -451,7 +451,7 @@ rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags) } #ifdef AFS_NT40_ENV if (err) -#elif defined(AFS_LINUX22_ENV) +#elif defined(AFS_LINUX_ENV) /* linux unfortunately returns ECONNREFUSED if the target port * is no longer in use */ /* and EAGAIN if a UDP checksum is incorrect */ diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index e9e7ab0..8e4eb98 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -20,7 +20,7 @@ # include "rx_kcommon.h" # endif # include "h/types.h" -# ifndef AFS_LINUX20_ENV +# ifndef AFS_LINUX_ENV # include "h/systm.h" # endif # if defined(AFS_SGI_ENV) || defined(AFS_HPUX110_ENV) || defined(AFS_NBSD50_ENV) @@ -30,7 +30,7 @@ # include "h/proc.h" # endif # include "h/socket.h" -# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) +# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_HPUX110_ENV) # if !defined(AFS_AIX41_ENV) # include "sys/mount.h" /* it gets pulled in by something later anyway */ # endif @@ -1690,7 +1690,7 @@ cpytoiovec(mblk_t * mp, int off, int len, struct iovec *iovs, #define m_cpytoc(a, b, c, d) cpytoc(a, b, c, d) #define m_cpytoiovec(a, b, c, d, e) cpytoiovec(a, b, c, d, e) #else -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN80_ENV) static int m_cpytoiovec(struct mbuf *m, int off, int len, struct iovec iovs[], int niovs) { @@ -1743,10 +1743,10 @@ m_cpytoiovec(struct mbuf *m, int off, int len, struct iovec iovs[], int niovs) return len; } -#endif /* LINUX */ +#endif /* !AFS_LINUX_ENV && !AFS_DARWIN80_ENV */ #endif /* AFS_SUN5_ENV */ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN80_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN80_ENV) #if defined(AFS_NBSD_ENV) int rx_mb_to_packet(struct mbuf *amb, void (*free) (struct mbuf *), int hdr_len, int data_len, struct rx_packet *phandle) @@ -2200,7 +2200,7 @@ rxi_NetSendError(struct rx_call *call, int code) if (code == -WSAEHOSTUNREACH) { down = 1; } -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) if (code == -ENETUNREACH) { down = 1; } diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index adc4960..e5b2414 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -42,12 +42,12 @@ #else /* AFS_NT40_ENV */ # if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) \ && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) \ - && !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX20_ENV) + && !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX_ENV) # include /* MIN, MAX on most commercial UNIX */ # endif /* Linux 3.7 doesn't have sys/param.h in kernel space, and afs/param.h ensures * that MIN and MAX are available for kernel builds. */ -# if !(defined(AFS_LINUX26_ENV) && defined(KERNEL)) +# if !(defined(AFS_LINUX_ENV) && defined(KERNEL)) # include /* MIN, MAX elsewhere */ # endif #endif /* !AFS_NT40_ENV */ diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index 23d04ee..3c7a69a 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -271,7 +271,7 @@ extern int rxk_ReadPacket(osi_socket so, struct rx_packet *p, int *host, # ifdef UKERNEL extern void *rx_ServerProc(void *); # endif -# ifndef AFS_LINUX26_ENV +# ifndef AFS_LINUX_ENV extern void osi_AssertFailK(const char *expr, const char *file, int line) AFS_NORETURN; # endif extern void rxk_Listener(void); @@ -282,7 +282,7 @@ extern rx_ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp); extern void osi_StopListener(void); /* ARCH/rx_kmutex.c */ -# if defined(AFS_LINUX20_ENV) +# if defined(AFS_LINUX_ENV) extern void afs_mutex_init(afs_kmutex_t * l); extern void afs_mutex_enter(afs_kmutex_t * l); extern int afs_mutex_tryenter(afs_kmutex_t * l); diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c index 2553988..e9195a1 100644 --- a/src/rx/rx_pthread.c +++ b/src/rx/rx_pthread.c @@ -424,7 +424,7 @@ rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags) #endif #ifndef AFS_RXERRQ_ENV -# ifdef AFS_LINUX22_ENV +# ifdef AFS_LINUX_ENV /* linux unfortunately returns ECONNREFUSED if the target port * is no longer in use */ /* and EAGAIN if a UDP checksum is incorrect */ diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index e2721d3..ee1c3e3 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -24,7 +24,7 @@ # if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV) # include "h/systm.h" # endif -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # include "h/socket.h" # endif # include "netinet/in.h" diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 7e6c06b..748914e 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -36,7 +36,7 @@ #define IPPORT_USERRESERVED 5000 # endif -#if defined(AFS_LINUX22_ENV) && defined(AFS_RXERRQ_ENV) +#if defined(AFS_LINUX_ENV) && defined(AFS_RXERRQ_ENV) # include # include # if defined(AFS_ADAPT_PMTU) && !defined(IP_MTU) @@ -94,7 +94,7 @@ rxi_GetHostUDPSocket(u_int ahost, u_short port) osi_socket socketFd = OSI_NULLSOCKET; struct sockaddr_in taddr; char *name = "rxi_GetUDPSocket: "; -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV # if defined(AFS_ADAPT_PMTU) int pmtu = IP_PMTUDISC_WANT; # else @@ -197,7 +197,7 @@ rxi_GetHostUDPSocket(u_int ahost, u_short port) rx_atomic_set(&rx_stats.socketGreedy, greedy); } -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV setsockopt(socketFd, SOL_IP, IP_MTU_DISCOVER, &pmtu, sizeof(pmtu)); #endif #ifdef AFS_RXERRQ_ENV @@ -436,7 +436,7 @@ fudge_netmask(afs_uint32 addr) -#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN160_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN160_ENV) int rxi_syscall(afs_uint32 a3, afs_uint32 a4, void *a5) { @@ -565,7 +565,7 @@ rx_GetIFInfo(void) } #endif /* SIOCGIFFLAGS */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN160_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN160_ENV) /* this won't run on an AIX system w/o a cache manager */ rxi_syscallp = rxi_syscall; #endif diff --git a/src/rx/test/testclient.c b/src/rx/test/testclient.c index accd085..0ed74c6 100644 --- a/src/rx/test/testclient.c +++ b/src/rx/test/testclient.c @@ -57,7 +57,7 @@ quitSignal(int ignore) rx_PrintStats(debugFile); } -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) int test_syscall(afs_uint32 a3, afs_uint32 a4, void *a5) { @@ -91,7 +91,7 @@ main(int argc, char **argv) int setFD = 0; int jumbo = 0; -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) setlinebuf(stdout); rxi_syscallp = test_syscall; #endif diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c index a84d206..deead44 100644 --- a/src/rx/test/testserver.c +++ b/src/rx/test/testserver.c @@ -53,7 +53,7 @@ quitSignal(int ignore) rx_PrintStats(debugFile); } -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) int test_syscall(a3, a4, a5) afs_uint32 a3, a4; @@ -80,7 +80,7 @@ main(argc, argv) int setFD = 0; int jumbo = 0; -#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX_ENV) setlinebuf(stdout); rxi_syscallp = test_syscall; #endif diff --git a/src/rx/xdr.c b/src/rx/xdr.c index 7d23917..7ef772d 100644 --- a/src/rx/xdr.c +++ b/src/rx/xdr.c @@ -48,10 +48,10 @@ #ifndef NeXT #if defined(KERNEL) && !defined(UKERNEL) -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV #include #endif #endif @@ -591,7 +591,7 @@ xdr_free(xdrproc_t proc, void *obj) x.x_op = XDR_FREE; /* See note in xdr.h for the method behind this madness */ -#if defined(AFS_I386_LINUX26_ENV) && defined(KERNEL) && !defined(UKERNEL) +#if defined(AFS_I386_LINUX_ENV) && defined(KERNEL) && !defined(UKERNEL) (*proc)(&x, obj, 0); #else (*proc)(&x, obj); diff --git a/src/rx/xdr.h b/src/rx/xdr.h index 61df7a1..2567372 100644 --- a/src/rx/xdr.h +++ b/src/rx/xdr.h @@ -185,7 +185,7 @@ enum xdr_op { * normal va_args prototype results in the arguments being placed on the * stack, where they aren't accessible to the 'real' function. */ -#if defined(AFS_I386_LINUX26_ENV) && defined(KERNEL) && !defined(UKERNEL) +#if defined(AFS_I386_LINUX_ENV) && defined(KERNEL) && !defined(UKERNEL) typedef bool_t(*xdrproc_t) (void *, caddr_t, u_int); #else typedef bool_t(*xdrproc_t) (void *, ...); diff --git a/src/rx/xdr_afsuuid.c b/src/rx/xdr_afsuuid.c index da7855a..dadfcf6 100644 --- a/src/rx/xdr_afsuuid.c +++ b/src/rx/xdr_afsuuid.c @@ -15,7 +15,7 @@ #include #if defined(KERNEL) && !defined(UKERNEL) -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include "h/string.h" #else #include diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c index 75bcd7c..1785019 100644 --- a/src/rx/xdr_array.c +++ b/src/rx/xdr_array.c @@ -47,16 +47,16 @@ */ #if defined(KERNEL) && !defined(UKERNEL) -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include "h/string.h" #else #ifndef AFS_DARWIN90_ENV #include #endif -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ #endif #include "xdr.h" diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c index 2a2e081..d6cb1f7 100644 --- a/src/rx/xdr_arrayn.c +++ b/src/rx/xdr_arrayn.c @@ -47,10 +47,10 @@ */ #if defined(KERNEL) && !defined(UKERNEL) -#if !defined(AFS_LINUX26_ENV) +#if !defined(AFS_LINUX_ENV) #include #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include "h/string.h" #else #include diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c index 63bf09a..cc87a81 100644 --- a/src/rx/xdr_int32.c +++ b/src/rx/xdr_int32.c @@ -34,7 +34,7 @@ #ifndef NeXT #if defined(KERNEL) && !defined(UKERNEL) -# if !defined(AFS_LINUX26_ENV) +# if !defined(AFS_LINUX_ENV) # include # endif #else diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c index c1925ed..d2b1e6b 100644 --- a/src/rx/xdr_int64.c +++ b/src/rx/xdr_int64.c @@ -8,7 +8,7 @@ #if defined(KERNEL) && !defined(UKERNEL) -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include "h/string.h" #else #include diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index 7256d32..f315d16 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -19,10 +19,10 @@ # ifndef UKERNEL # include "h/types.h" # include "h/uio.h" -# ifdef AFS_LINUX20_ENV +# ifdef AFS_LINUX_ENV # include "h/socket.h" # endif -# ifdef AFS_LINUX22_ENV +# ifdef AFS_LINUX_ENV # ifndef quad_t # define quad_t __quad_t # define u_quad_t __u_quad_t diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 10aee6c..ecd2f4f 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -455,7 +455,7 @@ h_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"h/socket.h\"\n"); f_print(fout, "#endif\n"); f_print(fout, "#ifndef DTYPE_SOCKET /* XXXXX */\n"); - f_print(fout, "#ifndef AFS_LINUX22_ENV\n"); + f_print(fout, "#ifndef AFS_LINUX_ENV\n"); f_print(fout, "#include \"h/file.h\"\n"); f_print(fout, "#endif\n"); f_print(fout, "#endif\n"); @@ -472,7 +472,7 @@ h_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"h/time.h\"\n"); f_print(fout, "#endif\n"); f_print(fout, "#ifndef XDR_GETLONG /* XXXXX */\n"); - f_print(fout, "#ifdef AFS_LINUX22_ENV\n"); + f_print(fout, "#ifdef AFS_LINUX_ENV\n"); f_print(fout, "#ifndef quad_t\n"); f_print(fout, "#define quad_t __quad_t\n"); f_print(fout, "#define u_quad_t __u_quad_t\n"); diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c index c88dbd0..28b6bfe 100644 --- a/src/rxkad/bg-fcrypt.c +++ b/src/rxkad/bg-fcrypt.c @@ -38,13 +38,13 @@ #ifdef KERNEL #ifndef UKERNEL #include "h/types.h" -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_OBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV) #include "netinet/in.h" #endif #else /* UKERNEL */ #include "afs/sysincludes.h" #endif /* UKERNEL */ -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #include #endif diff --git a/src/rxkad/fcrypt.c b/src/rxkad/fcrypt.c index 5488a0d..7108933 100644 --- a/src/rxkad/fcrypt.c +++ b/src/rxkad/fcrypt.c @@ -23,13 +23,13 @@ #include "h/systm.h" #endif #include "h/types.h" -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_OBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_OBSD_ENV) #include "netinet/in.h" #endif #else /* UKERNEL */ #include "afs/sysincludes.h" #endif /* UKERNEL */ -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #include #endif diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index 2f89425..6304883 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -22,7 +22,7 @@ #if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_XBSD_ENV) #include "h/systm.h" #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include "h/socket.h" #endif #ifndef AFS_OBSD_ENV diff --git a/src/sys/afssyscalls.h b/src/sys/afssyscalls.h index cd014d8..6a9391c 100644 --- a/src/sys/afssyscalls.h +++ b/src/sys/afssyscalls.h @@ -39,7 +39,7 @@ extern FILE *inode_debug_log; #endif /* Glue layer. */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV int proc_afs_syscall(long syscall, long param1, long param2, long param3, long param4, int *rval); #endif diff --git a/src/sys/glue.c b/src/sys/glue.c index 3562459..a143141 100644 --- a/src/sys/glue.c +++ b/src/sys/glue.c @@ -20,7 +20,7 @@ #include "afssyscalls.h" -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV int proc_afs_syscall(long syscall, long param1, long param2, long param3, long param4, int *rval) { struct afsprocdata syscall_data; diff --git a/src/sys/pioctl.c b/src/sys/pioctl.c index f2f9138..c71b140 100644 --- a/src/sys/pioctl.c +++ b/src/sys/pioctl.c @@ -40,7 +40,7 @@ lpioctl(char *path, int cmd, void *cmarg, int follow) return (syscall(AFS_PIOCTL, path, cmd, cmarg, follow)); } -#elif defined(AFS_LINUX20_ENV) +#elif defined(AFS_LINUX_ENV) int lpioctl(char *path, int cmd, void *cmarg, int follow) diff --git a/src/sys/setpag.c b/src/sys/setpag.c index 48570bf..ef1f4ff 100644 --- a/src/sys/setpag.c +++ b/src/sys/setpag.c @@ -50,7 +50,7 @@ lsetpag(void) { int errcode; -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV int rval; rval = proc_afs_syscall(AFSCALL_SETPAG,0,0,0,0,&errcode); diff --git a/src/sys/sys_prototypes.h b/src/sys/sys_prototypes.h index beb28f6..659cd83 100644 --- a/src/sys/sys_prototypes.h +++ b/src/sys/sys_prototypes.h @@ -11,7 +11,7 @@ #define _SYS_PROTOTYPES_H /* glue.c */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV extern int proc_afs_syscall(long, long, long, long, long, int *); #endif #ifdef AFS_DARWIN80_ENV diff --git a/src/tools/dumpscan/dumptool.c b/src/tools/dumpscan/dumptool.c index 61dc0e6..4ded93c 100644 --- a/src/tools/dumpscan/dumptool.c +++ b/src/tools/dumpscan/dumptool.c @@ -88,7 +88,7 @@ #include #include -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV #define _LARGEFILE64_SOURCE 1 #endif #ifdef RESIDENCY diff --git a/src/uss/uss_common.h b/src/uss/uss_common.h index ceda7c9..b0536ec 100644 --- a/src/uss/uss_common.h +++ b/src/uss/uss_common.h @@ -60,7 +60,7 @@ #define uss_VolumeLen 300 #define uss_DirPoolLen 300 -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) extern char *sys_errlist[]; #endif diff --git a/src/util/uuid.c b/src/util/uuid.c index af6dfa0..820bd8e 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -52,7 +52,7 @@ # include # else # include -# if !defined(AFS_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) +# if !defined(AFS_LINUX_ENV) && !defined(AFS_ARM_DARWIN_ENV) # include # endif # endif diff --git a/src/util/vice.h b/src/util/vice.h index 5342be7..bd05d91 100644 --- a/src/util/vice.h +++ b/src/util/vice.h @@ -12,7 +12,7 @@ #include #if !defined(AFS_NT40_ENV) -# if (!defined(AFS_FBSD_ENV) && !defined(AFS_LINUX26_ENV)) || !defined(KERNEL) || defined(UKERNEL) +# if (!defined(AFS_FBSD_ENV) && !defined(AFS_LINUX_ENV)) || !defined(KERNEL) || defined(UKERNEL) # include # endif #endif /* AFS_NT40_ENV */ diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index f82ad2b..39ba6ee 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -1061,10 +1061,10 @@ afs_syscall(long call, long parm0, long parm1, long parm2, long parm3, long parm4, long parm5, long parm6) { int code; -#if defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX20_ENV) +#if defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX_ENV) int rval; #endif -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #if defined AFS_LINUX_64BIT_KERNEL long long eparm[4]; /* don't want to sign extend it to 64bit, so using ulong */ @@ -1099,7 +1099,7 @@ afs_syscall(long call, long parm0, long parm1, long parm2, long parm3, #endif } } -#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX_ENV) || defined(AFS_SPARC_LINUX_ENV) /* on sparc this function returns none value, so do it myself */ __asm__ __volatile__("mov %o0, %i0; ret; restore"); #endif @@ -1122,7 +1122,7 @@ afs_syscall(long call, long parm0, long parm1, long parm2, long parm3, #endif #endif #endif -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ return code; } #endif diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 3b76dc4..460fb86 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -16,7 +16,7 @@ #if !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) /* Here be hacks. */ -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV #define __KERNEL__ #include #define _STRING_H 1 @@ -25,7 +25,7 @@ #undef USE_UCONTEXT #endif -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* For some reason, this doesn't get defined in linux/types.h if __KERNEL_STRICT_NAMES is defined. But the definition of struct inode uses it. @@ -106,7 +106,7 @@ struct ncp_sb_info { #define _KERNEL 1 #endif -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV #include #endif @@ -142,7 +142,7 @@ struct vnode foo; #include #endif -#ifndef AFS_LINUX26_ENV +#ifndef AFS_LINUX_ENV #include #endif @@ -177,7 +177,7 @@ struct vnode foo; #include #else #include "sys/vfs.h" -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #ifndef UIO_MAXIOV #define UIO_MAXIOV 1 /* don't care */ #endif @@ -192,30 +192,30 @@ struct vnode foo; #undef LONG_MAX #undef ULONG_MAX #define _LINUX_TIME_H -#ifndef AFS_LINUX26_ENV +#ifndef AFS_LINUX_ENV #define _LINUX_FCNTL_H #endif -#ifdef AFS_IA64_LINUX24_ENV +#ifdef AFS_IA64_LINUX_ENV #define flock64 flock -#endif /* AFS_IA64_LINUX24_ENV */ -#ifdef AFS_S390_LINUX20_ENV +#endif /* AFS_IA64_LINUX_ENV */ +#ifdef AFS_S390_LINUX_ENV #define _S390_STATFS_H #else -#ifdef AFS_SPARC64_LINUX20_ENV +#ifdef AFS_SPARC64_LINUX_ENV #define _SPARC64_STATFS_H #define _SPARC_STATFS_H #else -#ifdef AFS_SPARC_LINUX20_ENV +#ifdef AFS_SPARC_LINUX_ENV #define _SPARC_STATFS_H #else -#ifdef AFS_ALPHA_LINUX20_ENV +#ifdef AFS_ALPHA_LINUX_ENV #define _ALPHA_STATFS_H #else #define _I386_STATFS_H -#endif /* AFS_ALPHA_LINUX20_ENV */ -#endif /* AFS_SPARC_LINUX20_ENV */ -#endif /* AFS_SPARC64_LINUX20_ENV */ -#endif /* AFS_S390_LINUX20_ENV */ +#endif /* AFS_ALPHA_LINUX_ENV */ +#endif /* AFS_SPARC_LINUX_ENV */ +#endif /* AFS_SPARC64_LINUX_ENV */ +#endif /* AFS_S390_LINUX_ENV */ struct timezone { int a, b; }; @@ -229,7 +229,7 @@ struct timezone { #define timer_t ktimer_t #define timer_t_redefined #endif -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* For some reason, this doesn't get defined in linux/types.h if __KERNEL_STRICT_NAMES is defined. But the definition of struct inode uses it. @@ -238,7 +238,7 @@ struct timezone { /* got it from linux/types.h */ typedef unsigned long sector_t; #endif /* HAVE_SECTOR_T */ -#endif /* AFS_LINUX26_ENV */ +#endif /* AFS_LINUX_ENV */ #include #include #include @@ -246,7 +246,7 @@ typedef unsigned long sector_t; #undef timer_t #undef timer_t_redefined #endif -#else /* AFS_LINUX20_ENV */ +#else /* AFS_LINUX_ENV */ #ifdef AFS_HPUX110_ENV #define KERNEL #define _KERNEL 1 @@ -267,7 +267,7 @@ typedef enum _spustate { /* FROM /etc/conf/h/_types.h */ #else /* AFS_HPUX110_ENV */ #include "sys/vnode.h" #endif /* else AFS_HPUX110_ENV */ -#endif /* else AFS_LINUX20_ENV */ +#endif /* else AFS_LINUX_ENV */ #ifdef AFS_HPUX_ENV #include "sys/inode.h" #else @@ -275,7 +275,7 @@ typedef enum _spustate { /* FROM /etc/conf/h/_types.h */ #ifdef AFS_SUN5_ENV #include "sys/fs/ufs_inode.h" #else -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV #include "ufs/inode.h" #endif #endif @@ -338,7 +338,7 @@ typedef struct { } afs_kcondvar_t; #endif /* AFS_SGI65_ENV */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #include #include #define RX_ENABLE_LOCKS 1 @@ -347,7 +347,7 @@ typedef struct { int opaque2; } afs_kmutex_t; typedef void *afs_kcondvar_t; -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ #include /*#include "afs/osi.h"*/ @@ -358,7 +358,7 @@ typedef struct { } osi_timeval32_t; /* Needed here since KERNEL defined. */ /*#include "afs/volerrors.h"*/ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV #define _SYS_TIME_H #endif @@ -483,14 +483,14 @@ int opencore(); #define AFSNLIST(N, C) nlist64((N), (C)) #endif /* AFS_32BIT_KERNEL_ENV */ #else /* AFS_SGI61_ENV */ -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV struct afs_nlist { char *n_name; unsigned long n_value; }; -#else /* AFS_LINUX20_ENV */ +#else /* AFS_LINUX_ENV */ #define afs_nlist nlist -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ #define AFSNLIST(N, C) nlist((N), (C)) #endif /* AFS_SGI61_ENV */ #endif /* defined(AFS_HPUX_ENV) && defined(__LP64__) */ @@ -548,10 +548,10 @@ PrintIPAddr(int addr) return (char *)str; } -#ifdef AFS_LINUX20_ENV +#ifdef AFS_LINUX_ENV /* Find symbols in a live kernel. */ -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV #define KSYMS "/proc/kallsyms" #else #define KSYMS "/proc/ksyms" @@ -626,7 +626,7 @@ read_ksyms(void) ksyms[nksyms].s_value = (int)strtoul(line, &p, 16); #endif /* AFS_LINUX_64BIT_KERNEL */ p++; -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* Linux 2.6 /proc/kallsyms has a one-char symbol type between address and name, so step over it and the following blank. @@ -1779,7 +1779,7 @@ typedef struct event { #endif -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV /* This is replicated from LINUX/osi_alloc.c */ #define MEM_SPACE sizeof(int) @@ -2100,7 +2100,7 @@ print_allocs(int pnt) printf ("\n\nNOTE:\n\tAll [...]* entries above aren't counted towards the total mem since they're redundant\n"); -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV if (pnt) print_alloced_memlist(); #endif @@ -2577,13 +2577,13 @@ print_vnode(int kmem, struct vnode *vep, struct vnode *ptr, int pnt) #endif printf(", v_mregb=0x%lx\n", vep->v_mregb); #endif -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV /* Print out the stat cache and other inode info. */ printf ("\ti_ino=%d, i_mode=%x, i_nlink=%d, i_uid=%d, i_gid=%d, i_size=%d\n", vep->i_ino, vep->i_mode, vep->i_nlink, vep->i_uid, vep->i_gid, vep->i_size); -#ifdef AFS_LINUX24_ENV +#ifdef AFS_LINUX_ENV printf ("\ti_atime=%u, i_mtime=%u, i_ctime=%u, i_version=%u, i_nrpages=%u\n", vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version, @@ -2594,30 +2594,31 @@ print_vnode(int kmem, struct vnode *vep, struct vnode *ptr, int pnt) vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version, vep->i_nrpages); #endif -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV printf("\ti_op=0x%x, i_rdev=0x%x, i_sb=0x%x\n", vep->i_op, vep->i_rdev, vep->i_sb); -#else /* AFS_LINUX26_ENV */ +#else /* AFS_LINUX_ENV */ printf("\ti_op=0x%x, i_dev=0x%x, i_rdev=0x%x, i_sb=0x%x\n", vep->i_op, vep->i_dev, vep->i_rdev, vep->i_sb); -#endif /* AFS_LINUX26_ENV */ -#ifdef AFS_LINUX24_ENV +#endif /* AFS_LINUX_ENV */ + +#ifdef AFS_LINUX_ENV printf("\ti_sem: count=%d, sleepers=%d, wait=0x%x\n", vep->i_sem.count, vep->i_sem.sleepers, vep->i_sem.wait); #else printf("\ti_sem: count=%d, waking=%d, wait=0x%x\n", vep->i_sem.count, vep->i_sem.waking, vep->i_sem.wait); #endif -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV printf("\ti_hash=0x%x:0x%x, i_list=0x%x:0x%x, i_dentry=0x%x:0x%x\n", vep->i_hash.pprev, vep->i_hash.next, vep->i_list.prev, vep->i_list.next, vep->i_dentry.prev, vep->i_dentry.next); -#else /* AFS_LINUX26_ENV */ +#else /* AFS_LINUX_ENV */ printf("\ti_hash=0x%x:0x%x, i_list=0x%x:0x%x, i_dentry=0x%x:0x%x\n", vep->i_hash.prev, vep->i_hash.next, vep->i_list.prev, vep->i_list.next, vep->i_dentry.prev, vep->i_dentry.next); -#endif /* AFS_LINUX26_ENV */ -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ +#endif /* AFS_LINUX_ENV */ } void @@ -2751,7 +2752,7 @@ print_vcache(int kmem, struct vcache *vep, struct vcache *ptr, int pnt) } } } -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV printf("\tmapcnt=%d\n", vep->mapcnt); #endif } diff --git a/src/viced/viced.c b/src/viced/viced.c index 2119408..957a92b 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -329,13 +329,13 @@ int viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5) { afs_uint32 rcode; -# ifndef AFS_LINUX20_ENV +# ifndef AFS_LINUX_ENV void (*old) (int); old = (void (*)(int))signal(SIGSYS, SIG_IGN); # endif rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5); -# ifndef AFS_LINUX20_ENV +# ifndef AFS_LINUX_ENV signal(SIGSYS, old); # endif diff --git a/src/vol/daemon_com.h b/src/vol/daemon_com.h index dabaf3b..ce3a29e 100644 --- a/src/vol/daemon_com.h +++ b/src/vol/daemon_com.h @@ -87,7 +87,7 @@ enum SYNCReasonCode { afs_int64 _##buf##_l[SYNC_PROTO_MAX_LEN/sizeof(afs_int64)]; \ char * buf = (char *)(_##buf##_l) -#ifdef AFS_LINUX26_ENV +#ifdef AFS_LINUX_ENV /* Some Linux kernels have a bug where we are not woken up immediately from a * select() when data is available. Work around this by having a low select() * timeout, so we don't hang in those situations. */ diff --git a/src/vol/ihandle.h b/src/vol/ihandle.h index 8b99cc2..ac71ffd 100644 --- a/src/vol/ihandle.h +++ b/src/vol/ihandle.h @@ -520,7 +520,7 @@ extern Inode ih_icreate(IHandle_t * ih, int dev, char *part, Inode nI, int p1, # define IH_CREATE(H, D, P, N, P1, P2, P3, P4) \ ih_icreate(H, D, P, N, P1, P2, P3, P4) -# ifdef AFS_LINUX22_ENV +# ifdef AFS_LINUX_ENV # define OS_IOPEN(H) -1 # else # ifdef O_LARGEFILE @@ -544,7 +544,7 @@ extern Inode ih_icreate(IHandle_t * ih, int dev, char *part, Inode nI, int p1, # define OS_SYNC(FD) fsync(FD) -# ifdef AFS_LINUX22_ENV +# ifdef AFS_LINUX_ENV # define IH_INC(H, I, P) -1 # define IH_DEC(H, I, P) -1 # define IH_IREAD(H, O, B, S) -1 @@ -556,7 +556,7 @@ extern Inode ih_icreate(IHandle_t * ih, int dev, char *part, Inode nI, int p1, O, B, S) # define IH_IWRITE(H, O, B, S) \ inode_write((H)->ih_dev, (H)->ih_ino, (H)->ih_vid, O, B, S) -# endif /* AFS_LINUX22_ENV */ +# endif /* AFS_LINUX_ENV */ #endif /* AFS_NAMEI_ENV */ diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c index 75bf936..3e8cac7 100644 --- a/src/vol/listinodes.c +++ b/src/vol/listinodes.c @@ -26,7 +26,7 @@ #include #ifndef AFS_NAMEI_ENV -#if defined(AFS_LINUX20_ENV) +#if defined(AFS_LINUX_ENV) /* ListViceInodes * * Return codes: @@ -1210,7 +1210,7 @@ bread(FD_t fd, char *buf, daddr_t blk, afs_int32 size) return 0; } -#endif /* AFS_LINUX20_ENV */ +#endif /* AFS_LINUX_ENV */ static afs_int32 convertVolumeInfo(FdHandle_t *fdhr, FdHandle_t *fdhw, VolumeId vid) { diff --git a/src/vol/partition.c b/src/vol/partition.c index 628de33..8d37a07 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -52,7 +52,7 @@ #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ @@ -75,7 +75,7 @@ #include #include #else -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV #include #include #else @@ -275,7 +275,7 @@ static int VCheckPartition(char *part, char *devname, int logging) { struct afs_stat_st status; -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_NT40_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_NT40_ENV) char AFSIDatPath[MAXPATHLEN]; #endif @@ -313,7 +313,7 @@ VCheckPartition(char *part, char *devname, int logging) } #endif -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_NT40_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_NT40_ENV) strcpy(AFSIDatPath, part); strcat(AFSIDatPath, "/AFSIDat"); #ifdef AFS_NAMEI_ENV @@ -343,7 +343,7 @@ VCheckPartition(char *part, char *devname, int logging) return -1; #endif #endif /* AFS_NAMEI_ENV */ -#endif /* !AFS_LINUX20_ENV && !AFS_NT40_ENV */ +#endif /* !AFS_LINUX_ENV && !AFS_NT40_ENV */ VInitPartition(part, devname, status.st_dev); @@ -850,7 +850,7 @@ VAttachPartitions(void) } #endif -#ifdef AFS_LINUX22_ENV +#ifdef AFS_LINUX_ENV int VAttachPartitions(void) { @@ -883,7 +883,7 @@ VAttachPartitions(void) return errors; } -#endif /* AFS_LINUX22_ENV */ +#endif /* AFS_LINUX_ENV */ /* This routine is to be called whenever the actual name of the partition * is required. The canonical name is still in part->name. diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c index 1e522c9..6badf34 100644 --- a/src/vol/salvaged.c +++ b/src/vol/salvaged.c @@ -51,7 +51,7 @@ #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ diff --git a/src/vol/salvager.c b/src/vol/salvager.c index b61abf1..183e9cb 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -51,7 +51,7 @@ #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index f10e7b1..d2300ef 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -119,7 +119,7 @@ Vnodes with 0 inode pointers in RW volumes are now deleted. #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_LINUX_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ diff --git a/src/vol/volume.c b/src/vol/volume.c index be8f6f0..420aa93 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -58,7 +58,7 @@ #endif #endif #else /* AFS_VFSINCL_ENV */ -#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) +#if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_DARWIN_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ @@ -83,7 +83,7 @@ #if defined(AFS_SGI_ENV) #include #else -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV #include /* Need to find in libc 5, present in libc 6 */ #endif #endif diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 5d0474b..77bd5db 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -186,7 +186,7 @@ int volser_syscall(afs_uint32 a3, afs_uint32 a4, void *a5) { afs_uint32 rcode; -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV void (*old) (int); old = signal(SIGSYS, SIG_IGN); @@ -194,7 +194,7 @@ volser_syscall(afs_uint32 a3, afs_uint32 a4, void *a5) rcode = syscall(AFS_SYSCALL /* AFS_SYSCALL */ , 28 /* AFSCALL_CALL */ , a3, a4, a5); -#ifndef AFS_LINUX20_ENV +#ifndef AFS_LINUX_ENV signal(SIGSYS, old); #endif -- 1.9.4