OpenAFS Master Repository branch, openafs-stable-1_8_x, updated. openafs-stable-1_8_8_1-36-g4364479
Gerrit Code Review
gerrit@openafs.org
Thu, 4 Aug 2022 12:42:08 -0400
The following commit has been merged in the openafs-stable-1_8_x branch:
commit 43644792092698ace05a6e96bf58464d7837abdd
Author: Cheyenne Wills <cwills@sinenomine.net>
Date: Thu Jun 2 11:19:32 2022 -0600
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.
Reviewed-on: https://gerrit.openafs.org/14387
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 6329a523f6305541871bc3d1694065e7b17abe77)
[cwills@sinenomine.net] Conflicts due to:
'afs: Set AFS_VFSFSID to a numerical value' is already in 1.8.x
'Linux 5.15: Convert osi_Msg macro to a function' is already in 1.8.x
'fsint: remove dead code' is not in 1.8.x (removes fsint/afsaux.c)
'Remove rpctestlib' is not in 1.8.x (removes rpc_test_procs.c)
Change-Id: I19da50622f63db0fcad7acd834559c538e6030be
Reviewed-on: https://gerrit.openafs.org/14977
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
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 | 32 +++++------
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/fsint/afsaux.c | 2 +-
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 | 32 +++++------
src/rx/rx_kcommon.h | 30 +++++-----
src/rx/rx_kernel.h | 2 +-
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 +-
tests/rpctestlib/rpc_test_procs.c | 4 +-
144 files changed, 595 insertions(+), 643 deletions(-)
--
OpenAFS Master Repository