The following commit has been merged in the openafs-stable-1_8_x branch: commit 4e4ffde5d0a17e48f82c4b67e921a8881ffc4fe5 Author: Andrew Deason <adea...@dson.org> Date: Mon May 25 16:48:34 2020 -0500
IRIX: Remove pre-65 code Commit d1923139 (irix kill efs and start pruning pre-65) removed all files that defined AFS_SGI64_ENV and earlier, but didn't remove that code that depended on those defines. In addition, there has been code in the tree that checks for AFS_SGI53_ENV since OpenAFS 1.0, but nothing has ever defined Irix 5.3 support in OpenAFS. Remove all of this obsolete code. Change all references to AFS_SGIXX_ENV to AFS_SGI_ENV, and assume AFS_SGI_ENV is defined in all IRIX dirs. Consolidate some of the resulting ifdef logic appropriately. Reviewed-on: https://gerrit.openafs.org/14230 Reviewed-by: Benjamin Kaduk <ka...@mit.edu> Tested-by: Benjamin Kaduk <ka...@mit.edu> (cherry picked from commit e0c288416df59a117cd818ada930fd1259955983) Change-Id: Ie188b9f108bf55cfae7fcb358a1de21bad076f11 Reviewed-on: https://gerrit.openafs.org/15314 Tested-by: BuildBot <build...@rampaginggeek.com> Reviewed-by: Mark Vitale <mvit...@sinenomine.net> Reviewed-by: Michael Meffie <mmef...@sinenomine.net> Reviewed-by: Andrew Deason <adea...@sinenomine.net> Reviewed-by: Stephan Wiesand <stephan.wies...@desy.de> src/afs/IRIX/osi_gcpags.c | 33 ---- src/afs/IRIX/osi_groups.c | 87 --------- src/afs/IRIX/osi_idbg.c | 12 -- src/afs/IRIX/osi_machdep.h | 158 +--------------- src/afs/IRIX/osi_misc.c | 4 - src/afs/IRIX/osi_vcache.c | 18 -- src/afs/IRIX/osi_vfs.h | 6 +- src/afs/IRIX/osi_vfsops.c | 86 +-------- src/afs/IRIX/osi_vm.c | 22 --- src/afs/IRIX/osi_vnodeops.c | 399 +-------------------------------------- src/afs/VNOPS/afs_vnop_access.c | 2 +- src/afs/VNOPS/afs_vnop_attrs.c | 4 +- src/afs/VNOPS/afs_vnop_create.c | 28 ++- src/afs/VNOPS/afs_vnop_fid.c | 6 +- src/afs/VNOPS/afs_vnop_flock.c | 22 +-- src/afs/VNOPS/afs_vnop_open.c | 4 +- src/afs/VNOPS/afs_vnop_readdir.c | 69 ++----- src/afs/VNOPS/afs_vnop_write.c | 23 +-- src/afs/afs.h | 40 +--- src/afs/afs_analyze.c | 2 +- src/afs/afs_call.c | 10 +- src/afs/afs_conn.c | 2 +- src/afs/afs_dcache.c | 5 - src/afs/afs_error.c | 2 +- src/afs/afs_icl.c | 8 +- src/afs/afs_init.c | 4 - src/afs/afs_osi.c | 11 +- src/afs/afs_osi.h | 2 +- src/afs/afs_osi_pag.c | 16 +- src/afs/afs_pioctl.c | 17 +- src/afs/afs_prototypes.h | 28 +-- src/afs/afs_segments.c | 4 +- src/afs/afs_server.c | 8 +- src/afs/afs_syscall.c | 2 +- src/afs/afs_user.c | 2 +- src/afs/afs_util.c | 2 +- src/afs/afs_vcache.c | 10 +- src/afs/afs_volume.c | 2 +- src/afs/afs_warn.c | 2 +- src/afs/exporter.h | 2 +- src/afs/lock.h | 12 +- src/afs/sysincludes.h | 16 +- src/afsd/afsd.c | 20 +- src/afsd/afsd_kernel.c | 2 +- src/bozo/bnode.c | 2 +- src/config/icl.h | 2 +- src/config/param.sgi_65.h | 10 - src/dir/dir.c | 4 +- src/lwp/lwp.c | 6 +- src/lwp/process.c | 4 +- src/rx/IRIX/rx_kmutex.h | 14 -- src/rx/IRIX/rx_knet.c | 143 -------------- src/rx/rx_kcommon.c | 16 +- src/rx/rx_kcommon.h | 6 +- src/rx/rx_misc.c | 8 +- src/sys/afssyscalls.h | 4 +- src/sys/icreate.c | 6 +- src/venus/fstrace.c | 11 +- src/venus/kdump.c | 52 +++-- src/viced/viced.c | 2 +- 60 files changed, 179 insertions(+), 1325 deletions(-) -- OpenAFS Master Repository _______________________________________________ OpenAFS-cvs mailing list OpenAFS-cvs@openafs.org https://lists.openafs.org/mailman/listinfo/openafs-cvs