jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DEVELAC-junk-delta-20010327

Browse Source 
push additions so i can cvs update elsewhere

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

start on genericification to "features" which at this stage are hardcoded to
platforms

====================

placeholder file with per-platform features selection info

====================

install placeholder include file for now
This commit is contained in:
Derrick Brashear 2001-03-28 05:00:27 +00:00
parent 2263317ed7
commit 89fe38fb7d
5 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/afs/afs.h
View File

@ -9,6 +9,9 @@
#ifndef _AFS_H_
#define _AFS_H_
#include "../afs/config_platform.h"
/*
* AFS system call opcodes
*/
@ -1073,28 +1076,28 @@ extern int afs_norefpanic;
/* get a file's serial number from a vnode */
#ifndef afs_vnodeToInumber
#if defined(AFS_SGI62_ENV) || defined(AFS_HAVE_VXFS) || defined(AFS_DARWIN_ENV)
#ifdef VTOINUM_VNODETOINO
#define afs_vnodeToInumber(V) VnodeToIno(V)
#else
#ifdef AFS_DECOSF_ENV
#ifdef VTOINUM_VTOINUM
#define afs_vnodeToInumber(V) osi_vnodeToInumber(V)
#else
#define afs_vnodeToInumber(V) (VTOI(V)->i_number)
#endif /* AFS_DECOSF_ENV */
#endif /* AFS_SGI62_ENV */
#endif /* !VTOINUM_VTOINUM */
#endif /* !VTOINUM_VNODETOINO */
#endif
/* get a file's device number from a vnode */
#ifndef afs_vnodeToDev
#if defined(AFS_SGI62_ENV) || defined(AFS_HAVE_VXFS) || defined(AFS_DARWIN_ENV)
#ifdef VTODEV_VNODETODEV
#define afs_vnodeToDev(V) VnodeToDev(V)
#else
#ifdef AFS_DECOSF_ENV
#ifdef VTODEV_VTODEV
#define afs_vnodeToDev(V) osi_vnodeToDev(V)
#else
#define afs_vnodeToDev(V) (VTOI(V)->i_dev)
#endif /* AFS_DECOSF_ENV */
#endif /* AFS_SGI62_ENV */
#endif /* !VTODEV_VTODEV */
#endif /* !VTODEV_VNODETODEV */
#endif
#endif /* _AFS_H_ */

13
src/afs/afs_call.c
View File

@ -329,13 +329,11 @@ long parm, parm2, parm3, parm4, parm5, parm6;
while (afs_initState < AFSOP_START_BKG) afs_osi_Sleep(&afs_initState);
AFS_COPYIN((char *)parm2, (caddr_t) &cparms, sizeof(cparms), code);
if (code) {
#if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined (AFS_SGI64_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV)
goto out;
#else
#if !defined(AFS_SUN5_ENV) && !defined(AFS_OSF_ENV) && !defined (AFS_SGI64_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
setuerror(code);
code = -1;
goto out;
#endif
goto out;
}
afs_CacheInit_Done = 1;
{
@ -600,11 +598,7 @@ long parm, parm2, parm3, parm4, parm5, parm6;
out:
AFS_GUNLOCK();
#ifdef AFS_LINUX20_ENV
return -code;
#else
return code;
#endif
ERR_RETURN(code);
}
#ifdef AFS_AIX32_ENV
@ -688,7 +682,6 @@ syscall(syscall, p1, p2, p3, p4, p5, p6) {
* lsetpag - interface to afs_setpag().
*/
lsetpag() {
AFS_STATCNT(lsetpag);
return syscall(AFSCALL_SETPAG, 0, 0, 0, 0, 0);
}

3
src/config/Makefile
View File

@ -68,6 +68,9 @@ ${KERNELDIR}/afs/param.h ${DESTDIR}include/afs/param.h :: param.${SYS_NAME}.h
${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}include/afs/afs_sysnames.h :: afs_sysnames.h
$(RM) -f $@; $(CP) $? $@
${KERNELDIR}/afs/config_platform.h ${DESTDIR}include/afs/config_platform.h :: config_platform.h
$(RM) -f $@; $(CP) $? $@
DESTINCLS = ${DESTDIR}include/afs/afs_args.h ${DESTDIR}include/afs/venus.h ${DESTDIR}include/afs/debug.h ${DESTDIR}include/afs/afs_sysnames.h ${DESTDIR}include/afs/param.h ${DESTDIR}include/afs/stds.h ${DESTDIR}include/afs/icl.h
${KERNELDIR}/afs/stds.h ${DESTDIR}include/afs/stds.h :: stds.h

30
src/config/config_platform.h Normal file
View File

@ -0,0 +1,30 @@
/* This file is at least partly a bridge between the washtool and
autoconf worlds. It will likely be replaced later. */
#define ERR_RETURN(X) return X
#ifdef AFS_LINUX20_ENV
#define ERR_RETURN(X) return -X
#endif
#ifdef AFS_SGI62_ENV
#define VTOINUM_VNODETOINO
#define VTODEV_VNODETODEV
#endif
#ifdef AFS_SUN5_ENV
#define VTOINUM_VNODETOINO
#define VTODEV_VNODETODEV
#endif
#ifdef AFS_DARWIN_ENV
#define VTOINUM_VNODETOINO
#define VTODEV_VNODETODEV
#endif
#ifdef AFS_DECOSF_ENV
#define VTOINUM_VTOINUM
#define VTODEV_VTODEV
#endif

12
src/configure.in
View File

@ -17,8 +17,16 @@ AC_HEADER_TIME
AC_PREFIX_DEFAULT(/usr/afsws)
AC_CHECK_HEADERS(sys/types.h sys/param.h sys/file.h unistd.h)
AC_CHECK_HEADERS(io.h signal.h fcntl.h)
AC_CHECK_HEADERS(dirent.h)
AC_CHECK_HEADERS(fcntl.h)
AC_CHECK_HEADERS(io.h)
AC_CHECK_HEADERS(mntent.h)
AC_CHECK_HEADERS(signal.h)
AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(sys/fcntl.h sys/file.h sys/fs_types.h)
AC_CHECK_HEADERS(sys/mntent.h sys/mnttab.h sys/mount.h)
AC_CHECK_HEADERS(sys/param.h sys/types.h)
AC_CHECK_HEADERS(sys/vfs.h)
AC_CHECK_FUNCS(setitimer sigaction random)