linux-dont-require-osi-vfs-to-be-installed-20011017

based on reports from hartmans@mit.edu and jhutz@cmu.edu

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 8b46d8e..07e4239 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -35,12 +35,6 @@ all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
        esac
-       case ${SYS_NAME} in \
-               *linux* ) \
-                       ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${TOP_INCDIR}/afs ;;\
-               * ) \
-                       echo No vfs headers to install for ${SYS_NAME};; \
-       esac
 
 # NOTE: linux case uses --new as well to work around bug in some versions of
 # gencat.

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 1d6cdf2..bfa2000 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -183,9 +183,9 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
                alpha_linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                *linux* ) \
-                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
+                       ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libafs/afs -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \
                alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
                        ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
                sgi_6? ) \

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index c3d136f..3518150 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -263,7 +263,7 @@ typedef struct timeval {
 #endif
 #include <linux/version.h>
 #include <linux/fs.h>
-#include <afs/osi_vfs.h>
+#include <osi_vfs.h>
 #else /* AFS_LINUX20_ENV */
 #ifdef AFS_HPUX110_ENV
 #define        KERNEL