From a19532d2fff5c6f57ec6a85712bcebadaadfd1bd Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 4 Jun 2009 17:12:58 +0000 Subject: [PATCH] STABLE14-death-to-longc-procs-20060804 longc_procs.h was only used on Ultrix, about which we no longer care. Delete it, its installation rules, and the places where we were including it. (cherry picked from commit f3a77810db0044bd0fc3df1101269ab42b365fef) --- src/afs/Makefile.in | 12 ------------ src/afs/VNOPS/afs_vnop_flock.c | 4 ---- src/afs/afs_buffer.c | 1 - src/dir/dir.c | 1 - src/fsint/afscbint.xg | 4 ---- src/fsint/afsint.xg | 4 ---- src/rx/UKERNEL/rx_kcommon.h | 1 - src/rx/rx_kcommon.h | 1 - src/rx/rx_kernel.h | 2 -- src/rx/xdr_rx.c | 2 -- src/rxkad/bg-fcrypt.c | 2 -- src/rxkad/domestic/fcrypt.c | 2 -- src/vlserver/vldbint.xg | 1 - 13 files changed, 37 deletions(-) diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 9293c1185..34800373a 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -14,10 +14,6 @@ all: depinstall depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \ ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \ - esac afs_trace.h afs_trace.msf: afs_trace.et ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et @@ -44,10 +40,6 @@ afszcm.cat: afs_trace.msf esac install: ${DESTDIR}${includedir}/afs/afs.h ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \ - esac case ${SYS_NAME} in \ *linux* ) \ ${INSTALL} ${MKAFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs || true ;;\ @@ -132,10 +124,6 @@ ${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h dest: ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \ - esac case ${SYS_NAME} in \ i386_fbsd* ) \ echo skipping afszcm.cat install for ${SYS_NAME} ;; \ diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 414f45593..5e4b0e619 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -954,11 +954,7 @@ afs_xflock(void) return code; #else /* AFS_OSF_ENV */ if (!flockDone) -#ifdef DYNEL - (*afs_longcall_procs.LC_flock) (); -#else flock(); -#endif afs_PutFakeStat(&fakestate); return; #endif diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c index cc9053272..2d949aa48 100644 --- a/src/afs/afs_buffer.c +++ b/src/afs/afs_buffer.c @@ -43,7 +43,6 @@ RCSID #include "afs/dir.h" #include "afs/afs_stats.h" -#include "afs/longc_procs.h" #include "afs/afs.h" #ifndef BUF_TIME_MAX diff --git a/src/dir/dir.c b/src/dir/dir.c index ec4ad2632..0e3647dad 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -70,7 +70,6 @@ extern void *DNew(); #include "afs/dir.h" -#include "afs/longc_procs.h" #ifdef AFS_LINUX20_ENV #include "h/string.h" #endif diff --git a/src/fsint/afscbint.xg b/src/fsint/afscbint.xg index 8edc66ff5..ca45b2000 100644 --- a/src/fsint/afscbint.xg +++ b/src/fsint/afscbint.xg @@ -15,10 +15,6 @@ #include "common.xg" /*Common structures & definitions*/ -%#ifdef KERNEL -%#include "../afs/longc_procs.h" -%#endif - package RXAFSCB_ prefix S statindex 6 diff --git a/src/fsint/afsint.xg b/src/fsint/afsint.xg index 4843c3967..40abeb939 100644 --- a/src/fsint/afsint.xg +++ b/src/fsint/afsint.xg @@ -290,10 +290,6 @@ typedef afs_int32 ViceOfflineType; %#define NoSalvage 0 %#define Salvage 1 -%#ifdef KERNEL -%#include "../afs/longc_procs.h" -%#endif - %#define MAXCMDINT64S 3 %#define MAXCMDINT32S 200 %#define MAXCMDCHARS 256 diff --git a/src/rx/UKERNEL/rx_kcommon.h b/src/rx/UKERNEL/rx_kcommon.h index a30260f33..583e2a74e 100644 --- a/src/rx/UKERNEL/rx_kcommon.h +++ b/src/rx/UKERNEL/rx_kcommon.h @@ -22,7 +22,6 @@ #include "afs/lock.h" #include "rx/rx.h" #include "rx/rx_globals.h" -#include "afs/longc_procs.h" #include "afs/afs_stats.h" extern struct usr_ifnet *usr_ifnet; diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 717f47753..35f5c2424 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -136,7 +136,6 @@ typedef unsigned short etap_event_t; #include "rx/xdr.h" #include "rx/rx.h" #include "rx/rx_globals.h" -#include "afs/longc_procs.h" #include "afs/afs_stats.h" #include "h/errno.h" #ifdef KERNEL diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index 3bb6d7d35..ebb50de60 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -49,6 +49,4 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val); #define AFS_IFNET_T ifnet_t #endif -#include "afs/longc_procs.h" - #endif /* __RX_KERNEL_INCL_ */ diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index fe79fbd16..4f2a42550 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -55,8 +55,6 @@ RCSID #endif /* !UKERNEL */ #include "rx/rx.h" -#include "afs/longc_procs.h" - #else /* KERNEL */ #include #include diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c index 6e59f3d3a..2f775e2dd 100644 --- a/src/rxkad/bg-fcrypt.c +++ b/src/rxkad/bg-fcrypt.c @@ -56,8 +56,6 @@ RCSID #include #endif -#include "afs/longc_procs.h" - #else /* KERNEL */ #include diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c index c9ec88682..efd5613a6 100644 --- a/src/rxkad/domestic/fcrypt.c +++ b/src/rxkad/domestic/fcrypt.c @@ -41,8 +41,6 @@ RCSID #include #endif -#include "afs/longc_procs.h" - #else /* KERNEL */ #include diff --git a/src/vlserver/vldbint.xg b/src/vlserver/vldbint.xg index d56d5f489..9b3420df6 100644 --- a/src/vlserver/vldbint.xg +++ b/src/vlserver/vldbint.xg @@ -16,7 +16,6 @@ statindex 15 %#ifdef KERNEL %#define afs_xdr_array(a,b,c,d,e,f) afs_xdr_arrayN(a,b,c,d,e,f) -%#include "../afs/longc_procs.h" %#endif /* Current limitations on parameters that affect other packages (i.e. volume) */ -- 2.39.5