diff --git a/NEWS b/NEWS index e5118b244e..0be2de3018 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,13 @@ User-Visible OpenAFS Changes +OpenAFS 1.8.12.2 + + Linux clients + + * Add support for Linux 6.11 (15852, 15853, 15854) + * Fix build error on openSUSE 15.6 (15858) + * Fix build warning on Ubuntu 24.04 (15857) + OpenAFS 1.8.12.1 Linux clients diff --git a/configure-libafs.ac b/configure-libafs.ac index c0a121f0ea..529ac1108c 100644 --- a/configure-libafs.ac +++ b/configure-libafs.ac @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR([build-tools]) AC_CONFIG_SRCDIR([src/libafs/Makefile.common.in]) AC_CONFIG_HEADERS([src/config/afsconfig.h]) -MACOS_VERSION=1.8.13d1 +MACOS_VERSION=1.8.13d2 AC_SUBST([MACOS_VERSION]) diff --git a/configure.ac b/configure.ac index 21663b0636..ada3aa3d86 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR([src/cf]) AC_CONFIG_SRCDIR([src/config/stds.h]) AC_CONFIG_HEADERS([src/config/afsconfig.h]) -MACOS_VERSION=1.8.13d1 +MACOS_VERSION=1.8.13d2 AC_SUBST([MACOS_VERSION]) diff --git a/src/afs/AIX/osi_groups.c b/src/afs/AIX/osi_groups.c index 2ef317f424..219dd6db7d 100644 --- a/src/afs/AIX/osi_groups.c +++ b/src/afs/AIX/osi_groups.c @@ -19,6 +19,7 @@ #include "afs/sysincludes.h" #include "afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ @@ -130,7 +131,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) gidset[0] = gidset[1] = 0; AFS_STATCNT(afs_getgroups); - savengrps = ngrps = MIN(ngroups, cred->cr_ngrps); + savengrps = ngrps = opr_min(ngroups, cred->cr_ngrps); gp = cred->cr_groups; while (ngrps--) *gidset++ = *gp++; diff --git a/src/afs/DARWIN/osi_groups.c b/src/afs/DARWIN/osi_groups.c index 11e65e3787..5899c7287e 100644 --- a/src/afs/DARWIN/osi_groups.c +++ b/src/afs/DARWIN/osi_groups.c @@ -18,6 +18,7 @@ #include "afs/param.h" #include "afs/sysincludes.h" #include "afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ /* We should be doing something better anyway */ @@ -122,7 +123,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) gid_t *gp; AFS_STATCNT(afs_getgroups); - savengrps = ngrps = MIN(ngroups, cred->cr_ngroups); + savengrps = ngrps = opr_min(ngroups, cred->cr_ngroups); gp = cred->cr_groups; while (ngrps--) *gidset++ = *gp++; diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c index b903cc7c4a..a92ed53586 100644 --- a/src/afs/DARWIN/osi_vnodeops.c +++ b/src/afs/DARWIN/osi_vnodeops.c @@ -8,6 +8,7 @@ #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ #include /* statistics */ +#include #include #include #include @@ -2103,7 +2104,7 @@ afs_vop_cmap(ap) * } */ *ap; { *ap->a_bpn = (daddr_t) (ap->a_foffset / DEV_BSIZE); - *ap->a_run = MAX(ap->a_size, AFS_CHUNKSIZE(ap->a_foffset)); + *ap->a_run = opr_max(ap->a_size, AFS_CHUNKSIZE(ap->a_foffset)); return 0; } #endif diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c index 6326f6c907..2267550bf8 100644 --- a/src/afs/FBSD/osi_groups.c +++ b/src/afs/FBSD/osi_groups.c @@ -22,6 +22,7 @@ #include "afs/sysincludes.h" #include "afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ static int @@ -106,7 +107,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) gid_t *gp; AFS_STATCNT(afs_getgroups); - savengrps = ngrps = MIN(ngroups, cred->cr_ngroups); + savengrps = ngrps = opr_min(ngroups, cred->cr_ngroups); gp = cred->cr_groups; while (ngrps--) *gidset++ = *gp++; diff --git a/src/afs/HPUX/osi_groups.c b/src/afs/HPUX/osi_groups.c index 8d6d9dbd7f..c3b024c23e 100644 --- a/src/afs/HPUX/osi_groups.c +++ b/src/afs/HPUX/osi_groups.c @@ -19,6 +19,7 @@ #include "afs/sysincludes.h" #include "afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ static int @@ -104,7 +105,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) if (gp[-1] != NOGROUP) break; } - savengrps = ngrps = MIN(ngroups, gp - cred->cr_groups); + savengrps = ngrps = opr_min(ngroups, gp - cred->cr_groups); for (gp = cred->cr_groups; ngrps--;) *gidset++ = *gp++; return savengrps; diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index b54bf1a25e..711cae8e0b 100644 --- a/src/afs/HPUX/osi_vnodeops.c +++ b/src/afs/HPUX/osi_vnodeops.c @@ -15,6 +15,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics stuff */ #include @@ -87,7 +88,7 @@ m_cpytoc(m, off, len, cp) if (m == NULL) return (len); - ml = MIN(len, m->m_len - off); + ml = opr_min(len, m->m_len - off); memcpy(cp, mtod(m, caddr_t) + off, (u_int) ml); cp += ml; len -= ml; @@ -720,8 +721,8 @@ afspgin_setup_io_ranges(vfspage_t * vm_info, pgcnt_t bpages, k_off_t isize, maxpage = startindex + (bpages - (startindex + file_offset) % bpages); maxpage = vm_reset_maxpage(vm_info, maxpage); - maxpage = MIN(maxpage, (pgcnt_t) btorp(isize) - file_offset); - maxpage = MIN(maxpage, startindex + maxpagein); + maxpage = opr_min(maxpage, (pgcnt_t) btorp(isize) - file_offset); + maxpage = opr_min(maxpage, startindex + maxpagein); multio_maxpage = maxpage = vm_maxpage(vm_info, maxpage); if (!maxpage) @@ -753,7 +754,7 @@ afspgin_setup_io_ranges(vfspage_t * vm_info, pgcnt_t bpages, k_off_t isize, maxpage = startindex + count; VASSERT(maxpage <= startindex + maxpagein); minpage = startindex - (startindex + file_offset) % bpages; - minpage = MAX(minpage, maxpage - maxpagein); + minpage = opr_max(minpage, maxpage - maxpagein); VASSERT(startindex >= VM_BASE_OFFSET(vm_info)); minpage = vm_minpage(vm_info, minpage); VASSERT(minpage <= startindex); diff --git a/src/afs/IRIX/osi_groups.c b/src/afs/IRIX/osi_groups.c index 208ddcde57..d3f8b33474 100644 --- a/src/afs/IRIX/osi_groups.c +++ b/src/afs/IRIX/osi_groups.c @@ -21,6 +21,7 @@ #include "afs/sysincludes.h" #include "afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ @@ -229,7 +230,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) gidset[0] = gidset[1] = 0; AFS_STATCNT(afs_getgroups); - savengrps = ngrps = MIN(ngroups, cred->cr_ngroups); + savengrps = ngrps = opr_min(ngroups, cred->cr_ngroups); gp = cred->cr_groups; while (ngrps--) *gidset++ = *gp++; diff --git a/src/afs/IRIX/osi_vnodeops.c b/src/afs/IRIX/osi_vnodeops.c index 1d4a26cff1..da0df46c4e 100644 --- a/src/afs/IRIX/osi_vnodeops.c +++ b/src/afs/IRIX/osi_vnodeops.c @@ -16,6 +16,7 @@ #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ #include "sys/flock.h" #include "afs/nfsclient.h" @@ -408,7 +409,7 @@ afsrwvp(struct vcache *avc, struct uio *uio, enum uio_rw rw, /* * compute minimum of rest of block and rest of file */ - cnt = MIN(bsize - off, rem); + cnt = opr_min(bsize - off, rem); osi_Assert((off + cnt) <= bsize); bsize = ctob(btoc(off + cnt)); len = BTOBBT(bsize); @@ -417,7 +418,7 @@ afsrwvp(struct vcache *avc, struct uio *uio, enum uio_rw rw, bmv[0].length = len; bmv[0].bsize = bsize; bmv[0].pboff = off; - bmv[0].pbsize = MIN(cnt, uio->uio_resid); + bmv[0].pbsize = opr_min(cnt, uio->uio_resid); bmv[0].eof = 0; bmv[0].pbdev = vp->v_rdev; bmv[0].pmp = uio->uio_pmp; @@ -439,7 +440,7 @@ afsrwvp(struct vcache *avc, struct uio *uio, enum uio_rw rw, bsize = AFSBSIZE; bmv[1].bn = bmv[1].offset = bn + len; osi_Assert((BBTOB(bn + len) % bsize) == 0); - acnt = MIN(bsize, rem); + acnt = opr_min(bsize, rem); bsize = ctob(btoc(acnt)); len = BTOBBT(bsize); nmaps = 2; @@ -500,7 +501,7 @@ afsrwvp(struct vcache *avc, struct uio *uio, enum uio_rw rw, } counter++; - cnt = MIN(bsize - off, uio->uio_resid); + cnt = opr_min(bsize - off, uio->uio_resid); bsize = ctob(btoc(off + cnt)); len = BTOBBT(bsize); bmv[0].bn = bn; @@ -637,7 +638,7 @@ OSI_VC_DECL(avc); if (rem <= 0) cnt = 0; /* EOF */ else - cnt = MIN(bsize - off, rem); + cnt = opr_min(bsize - off, rem); /* * It is benign to ignore *nbmv > 1, since it is only for requesting @@ -650,7 +651,7 @@ OSI_VC_DECL(avc); */ osi_Assert((off + cnt) <= bsize); bsize = ctob(btoc(off + cnt)); - bmv->pbsize = MIN(cnt, count); + bmv->pbsize = opr_min(cnt, count); bmv->eof = 0; bmv->pmp = NULL; bmv->pbdev = avc->v.v_rdev; diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index ba0d9bceb8..f60d79a198 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1020,7 +1020,7 @@ struct file_operations afs_file_fops = { # else .splice_write = generic_file_splice_write, # endif -# if LINUX_VERSION_CODE >= KERNEL_VERSION(6,5,0) +# if defined(HAVE_LINUX_NO_GENERIC_FILE_SPLICE_READ) .splice_read = filemap_splice_read, # else .splice_read = generic_file_splice_read, diff --git a/src/afs/NBSD/osi_groups.c b/src/afs/NBSD/osi_groups.c index 78b80e70bd..9ee543932b 100644 --- a/src/afs/NBSD/osi_groups.c +++ b/src/afs/NBSD/osi_groups.c @@ -21,6 +21,7 @@ #include "afs/sysincludes.h" #include "afs/afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ #include "sys/syscallargs.h" @@ -106,7 +107,7 @@ osi_getgroups(afs_ucred_t *cred, int ngroups, gid_t *gidset) { AFS_STATCNT(afs_getgroups); - ngroups = MIN(kauth_cred_ngroups(cred), ngroups); + ngroups = opr_min(kauth_cred_ngroups(cred), ngroups); kauth_cred_getgroups(cred, gidset, ngroups, UIO_SYSSPACE); return ngroups; diff --git a/src/afs/NBSD/osi_machdep.h b/src/afs/NBSD/osi_machdep.h index 43aa621019..c8fc4d1f89 100644 --- a/src/afs/NBSD/osi_machdep.h +++ b/src/afs/NBSD/osi_machdep.h @@ -184,14 +184,6 @@ extern struct lock afs_global_lock; #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ASSEMBLER */ /* vnodes */ diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c index 2dc0a9b0cf..f6c6049190 100644 --- a/src/afs/NBSD/osi_vnodeops.c +++ b/src/afs/NBSD/osi_vnodeops.c @@ -100,6 +100,7 @@ NONINFRINGEMENT. #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ #include @@ -206,7 +207,7 @@ static void afs_nbsd_gop_size(struct vnode *vp, off_t size, off_t *eobp, int flags) { - *eobp = MAX(size, vp->v_size); + *eobp = opr_max(size, vp->v_size); } static int diff --git a/src/afs/OBSD/osi_groups.c b/src/afs/OBSD/osi_groups.c index e26088f19d..208e5a7447 100644 --- a/src/afs/OBSD/osi_groups.c +++ b/src/afs/OBSD/osi_groups.c @@ -21,6 +21,7 @@ #include "afs/sysincludes.h" #include "afs/afsincludes.h" +#include "afs/opr.h" #include "afs/afs_stats.h" /* statistics */ #include "sys/syscallargs.h" @@ -115,7 +116,7 @@ afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset) gid_t *gp; AFS_STATCNT(afs_getgroups); - savengrps = ngrps = MIN(ngroups, cred->cr_ngroups); + savengrps = ngrps = opr_min(ngroups, cred->cr_ngroups); gp = cred->cr_groups; while (ngrps--) *gidset++ = *gp++; diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c index 2d11b445a2..c29dca709c 100644 --- a/src/afs/UKERNEL/afs_usrops.c +++ b/src/afs/UKERNEL/afs_usrops.c @@ -30,6 +30,7 @@ #include "afs/afs_bypasscache.h" #include "rx/rx_globals.h" #include "afsd/afsd.h" +#include "afs/opr.h" #define VFS 1 #undef VIRTUE @@ -46,13 +47,6 @@ #define CELLINFOFILE "CellItems" #define MAXIPADDRS 64 -#ifndef MIN -#define MIN(A,B) ((A)<(B)?(A):(B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A)>(B)?(A):(B)) -#endif - extern int cacheDiskType; char afs_LclCellName[64]; @@ -276,7 +270,7 @@ usr_uiomove(char *kbuf, int n, int rw, struct usr_uio *uio) */ ptr = kbuf; while (nio > 0 && n > 0) { - len = MIN(n, iovp->iov_len); + len = opr_min(n, iovp->iov_len); if (rw == UIO_READ) { memcpy(iovp->iov_base, ptr, len); } else { diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c index c4296bb6f3..4aeb87a4ab 100644 --- a/src/afs/VNOPS/afs_vnop_strategy.c +++ b/src/afs/VNOPS/afs_vnop_strategy.c @@ -24,6 +24,7 @@ #include "afs/afs_cbqueue.h" #include "afs/nfsclient.h" #include "afs/afs_osidnlc.h" +#include "afs/opr.h" @@ -177,7 +178,7 @@ int afs_ustrategy(struct buf *abp) * XXX It this really right? Ideally we should always write block size multiple * and not any arbitrary size, right? XXX */ - len = MIN(len, tvc->f.m.Length - dbtob(abp->b_blkno)); + len = opr_min(len, tvc->f.m.Length - dbtob(abp->b_blkno)); #endif tuio.afsio_resid = len; #if defined(AFS_NBSD40_ENV) || defined(FBSD_STRUCT_BUF_NO_SAVEADDR) diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index 3479348e1f..c206a03943 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -26,6 +26,7 @@ #include "afs/afs_cbqueue.h" #include "afs/nfsclient.h" #include "afs/afs_osidnlc.h" +#include "afs/opr.h" extern unsigned char *afs_indexFlags; @@ -250,7 +251,7 @@ afs_write(struct vcache *avc, struct uio *auio, int aio, */ osi_Assert(filePos <= avc->f.m.Length); diff = avc->f.m.Length - filePos; - AFS_UIO_SETRESID(auio, MIN(totalLength, diff)); + AFS_UIO_SETRESID(auio, opr_min(totalLength, diff)); totalLength = AFS_UIO_RESID(auio); } #else diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 4ac63b1872..45b3f55eb6 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -18,6 +18,7 @@ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" #include "rx/rx_globals.h" +#include "afs/opr.h" #if !defined(UKERNEL) # if defined(AFS_LINUX_ENV) # include "osi_compat.h" @@ -968,9 +969,9 @@ afs_syscall_call(long parm, long parm2, long parm3, if (mvParam->reqtype == AFS_USPC_UMV) { /* don't copy out random kernel memory */ AFS_COPYOUT(param2, AFSKPTR(parm4), - MIN(namebufsz, strlen((char *)param2)+1), code); + opr_min(namebufsz, strlen((char *)param2)+1), code); AFS_COPYOUT(param1, AFSKPTR(parm3), - MIN(namebufsz, strlen((char *)param1)+1), code); + opr_min(namebufsz, strlen((char *)param1)+1), code); } AFS_COPYOUT((caddr_t)mvParam, AFSKPTR(parm2), sizeof(struct afs_uspc_param), code); diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4 index 54fc6786ce..69b79c5cf6 100644 --- a/src/cf/linux-kernel-func.m4 +++ b/src/cf/linux-kernel-func.m4 @@ -273,6 +273,33 @@ AC_CHECK_LINUX_FUNC([filemap_alloc_folio], [[static struct folio *folio; folio = filemap_alloc_folio(0, 0);]]) +dnl Linux 6.3 introduced filemap_splice_read(), which is a replacement for +dnl generic_file_splice_read(). But filemap_splice_read() at this point was not +dnl fully supported for use with all filesystems. +dnl +dnl Linux 6.5 removed generic_file_splice_read(), and changed +dnl filemap_splice_read() to be supported for all filesystems. +dnl +dnl To decide which function to use, we cannot simply check for +dnl filemap_splice_read(), since we need to avoid using filemap_splice_read() +dnl until it was fixed in Linux 6.5. We cannot simply check the Linux version +dnl number, since some downstream kernels fix filemap_splice_read() and remove +dnl generic_file_splice_read() before Linux 6.5 (e.g., openSUSE 15.6). +dnl +dnl To decide what function to use, we check if generic_file_splice_read() is +dnl missing. If generic_file_splice_read() is missing, use +dnl filemap_splice_read(); otherwise, use generic_file_splice_read(). +dnl +dnl To check if generic_file_splice_read() is missing, define our own +dnl generic_file_splice_read() function with a conflicting signature. If we can +dnl define it, the real generic_file_splice_read() must be missing. +AC_CHECK_LINUX_FUNC([no_generic_file_splice_read], + [[#include + char *generic_file_splice_read(char *p); + char *generic_file_splice_read(char *p) { return p + 1; }]], + [[static char buff[10], *ap; + ap = generic_file_splice_read(buff); ]]) + dnl Consequences - things which get set as a result of the dnl above tests AS_IF([test "x$ac_cv_linux_func_d_alloc_anon" = "xno"], diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 6f64e19bb5..e8d54ba35c 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -88,7 +88,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1202 +AFSPRODUCT_VER_PATCH=1203 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index e6420a6317..f00a981ab2 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -88,7 +88,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1202 +AFSPRODUCT_VER_PATCH=1203 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 8db928814d..e8cfb0bea5 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -92,7 +92,7 @@ AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=8 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_PATCH) -AFSPRODUCT_VER_PATCH=1202 +AFSPRODUCT_VER_PATCH=1203 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index 9c2baa0d29..2b36a568cf 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -271,6 +271,3 @@ typedef int errno_t; /* Build afsroken.dll as a dynamic library */ #define ROKEN_LIB_DYNAMIC 1 - -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/src/config/param.generic_fbsd.h b/src/config/param.generic_fbsd.h index e09158b952..e74e84ffb7 100644 --- a/src/config/param.generic_fbsd.h +++ b/src/config/param.generic_fbsd.h @@ -88,16 +88,6 @@ # if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -# ifdef KERNEL -# ifndef MIN -# define MIN(A,B) ((A) < (B) ? (A) : (B)) -# endif -# ifndef MAX -# define MAX(A,B) ((A) > (B) ? (A) : (B)) -# endif -# endif /* KERNEL */ - # endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.i386_dfbsd_23.h b/src/config/param.i386_dfbsd_23.h index 46b5aaf4b7..aad44f55d8 100644 --- a/src/config/param.i386_dfbsd_23.h +++ b/src/config/param.i386_dfbsd_23.h @@ -100,16 +100,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.linux26.h b/src/config/param.linux26.h index 8fa1e3cb92..2e9ee6fbe8 100644 --- a/src/config/param.linux26.h +++ b/src/config/param.linux26.h @@ -40,16 +40,6 @@ #define AFS_GLOBAL_SUNLOCK #endif /* __KERNEL__ */ -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - -#endif /* KERNEL */ - #ifndef KERNEL #define __USE_LARGEFILE64 1 #if !defined off64_t diff --git a/src/config/param.nbsd15.h b/src/config/param.nbsd15.h index 771ace0467..5c5a17d74f 100644 --- a/src/config/param.nbsd15.h +++ b/src/config/param.nbsd15.h @@ -88,16 +88,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.nbsd16.h b/src/config/param.nbsd16.h index 1630fdf20c..355a5a240f 100644 --- a/src/config/param.nbsd16.h +++ b/src/config/param.nbsd16.h @@ -89,16 +89,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.nbsd20.h b/src/config/param.nbsd20.h index 140e971642..bc5ee09ace 100644 --- a/src/config/param.nbsd20.h +++ b/src/config/param.nbsd20.h @@ -95,16 +95,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL */ diff --git a/src/config/param.nbsd21.h b/src/config/param.nbsd21.h index 9402be5bb1..35155da118 100644 --- a/src/config/param.nbsd21.h +++ b/src/config/param.nbsd21.h @@ -95,16 +95,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL */ diff --git a/src/config/param.nbsd30.h b/src/config/param.nbsd30.h index 96e4a73957..d8129d248d 100644 --- a/src/config/param.nbsd30.h +++ b/src/config/param.nbsd30.h @@ -91,16 +91,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL */ diff --git a/src/config/param.nbsd40.h b/src/config/param.nbsd40.h index 7e3a92101f..6c22e252a0 100644 --- a/src/config/param.nbsd40.h +++ b/src/config/param.nbsd40.h @@ -97,16 +97,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL_DEPRECATED */ diff --git a/src/config/param.nbsd50.h b/src/config/param.nbsd50.h index fcb2077caa..268d0f3045 100644 --- a/src/config/param.nbsd50.h +++ b/src/config/param.nbsd50.h @@ -94,16 +94,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL_DEPRECATED */ diff --git a/src/config/param.nbsd60.h b/src/config/param.nbsd60.h index dda79311ec..6e08c4cae9 100644 --- a/src/config/param.nbsd60.h +++ b/src/config/param.nbsd60.h @@ -95,16 +95,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL_DEPRECATED */ diff --git a/src/config/param.nbsd70.h b/src/config/param.nbsd70.h index bb7534fb36..4356226a64 100644 --- a/src/config/param.nbsd70.h +++ b/src/config/param.nbsd70.h @@ -96,16 +96,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) enum vcexcl { NONEXCL, EXCL }; - -#ifdef KERNEL -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif -#endif /* KERNEL */ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ #endif /* _KERNEL_DEPRECATED */ diff --git a/src/config/param.obsd31.h b/src/config/param.obsd31.h index edf9a73a43..f77cbcef7f 100644 --- a/src/config/param.obsd31.h +++ b/src/config/param.obsd31.h @@ -44,14 +44,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd32.h b/src/config/param.obsd32.h index 3472178ef9..26f19511d3 100644 --- a/src/config/param.obsd32.h +++ b/src/config/param.obsd32.h @@ -43,14 +43,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd33.h b/src/config/param.obsd33.h index a82cb43022..0822cc3ea9 100644 --- a/src/config/param.obsd33.h +++ b/src/config/param.obsd33.h @@ -47,14 +47,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd34.h b/src/config/param.obsd34.h index 62e6062142..661a6f94d6 100644 --- a/src/config/param.obsd34.h +++ b/src/config/param.obsd34.h @@ -47,14 +47,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd35.h b/src/config/param.obsd35.h index f03dce86d6..43c9fe28d4 100644 --- a/src/config/param.obsd35.h +++ b/src/config/param.obsd35.h @@ -47,14 +47,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd36.h b/src/config/param.obsd36.h index 0ee70960ff..cc981888d4 100644 --- a/src/config/param.obsd36.h +++ b/src/config/param.obsd36.h @@ -49,14 +49,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd37.h b/src/config/param.obsd37.h index fc26d85f11..032b054eda 100644 --- a/src/config/param.obsd37.h +++ b/src/config/param.obsd37.h @@ -50,14 +50,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd38.h b/src/config/param.obsd38.h index 6fa98fed62..5c33062c2c 100644 --- a/src/config/param.obsd38.h +++ b/src/config/param.obsd38.h @@ -51,14 +51,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd39.h b/src/config/param.obsd39.h index 61626f94e1..f4955de9d3 100644 --- a/src/config/param.obsd39.h +++ b/src/config/param.obsd39.h @@ -55,14 +55,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd40.h b/src/config/param.obsd40.h index 23df49de3c..f00a6b182a 100644 --- a/src/config/param.obsd40.h +++ b/src/config/param.obsd40.h @@ -51,14 +51,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd41.h b/src/config/param.obsd41.h index e102260d6a..d4a41e1f3f 100644 --- a/src/config/param.obsd41.h +++ b/src/config/param.obsd41.h @@ -54,14 +54,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd42.h b/src/config/param.obsd42.h index b3f821bb9e..c2c8ea6786 100644 --- a/src/config/param.obsd42.h +++ b/src/config/param.obsd42.h @@ -59,14 +59,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd43.h b/src/config/param.obsd43.h index 6dd7baa7a5..833458f7bf 100644 --- a/src/config/param.obsd43.h +++ b/src/config/param.obsd43.h @@ -60,14 +60,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd44.h b/src/config/param.obsd44.h index 624795d382..89f396ccd0 100644 --- a/src/config/param.obsd44.h +++ b/src/config/param.obsd44.h @@ -61,14 +61,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd45.h b/src/config/param.obsd45.h index aab537e7c3..cbe7866039 100644 --- a/src/config/param.obsd45.h +++ b/src/config/param.obsd45.h @@ -61,14 +61,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd46.h b/src/config/param.obsd46.h index ef123d7f7e..d515f85764 100644 --- a/src/config/param.obsd46.h +++ b/src/config/param.obsd46.h @@ -66,14 +66,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd47.h b/src/config/param.obsd47.h index beabaa2933..ffd56ca6b0 100644 --- a/src/config/param.obsd47.h +++ b/src/config/param.obsd47.h @@ -67,14 +67,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd48.h b/src/config/param.obsd48.h index d87d53d28d..7b6a8e7dd2 100644 --- a/src/config/param.obsd48.h +++ b/src/config/param.obsd48.h @@ -64,14 +64,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd49.h b/src/config/param.obsd49.h index 28e3838908..0cba5fbf9e 100644 --- a/src/config/param.obsd49.h +++ b/src/config/param.obsd49.h @@ -65,14 +65,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd50.h b/src/config/param.obsd50.h index effaccdd1d..5df568d97a 100644 --- a/src/config/param.obsd50.h +++ b/src/config/param.obsd50.h @@ -66,14 +66,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd51.h b/src/config/param.obsd51.h index 49b5c33049..52fb2fa985 100644 --- a/src/config/param.obsd51.h +++ b/src/config/param.obsd51.h @@ -67,14 +67,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd52.h b/src/config/param.obsd52.h index 9cfa12c5a9..0b2f43072b 100644 --- a/src/config/param.obsd52.h +++ b/src/config/param.obsd52.h @@ -68,14 +68,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd53.h b/src/config/param.obsd53.h index d140dc0667..a6c168863d 100644 --- a/src/config/param.obsd53.h +++ b/src/config/param.obsd53.h @@ -69,14 +69,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/config/param.obsd54.h b/src/config/param.obsd54.h index 797ca45a38..88277bbf86 100644 --- a/src/config/param.obsd54.h +++ b/src/config/param.obsd54.h @@ -70,14 +70,6 @@ #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) enum vcexcl { NONEXCL, EXCL }; - -#ifndef MIN -#define MIN(A,B) ((A) < (B) ? (A) : (B)) -#endif -#ifndef MAX -#define MAX(A,B) ((A) > (B) ? (A) : (B)) -#endif - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ #endif /* _KERNEL */ diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c index 1251d06caf..82b576fe2a 100644 --- a/src/lwp/iomgr.c +++ b/src/lwp/iomgr.c @@ -51,10 +51,6 @@ typedef unsigned char bool; #define FALSE 0 #define TRUE 1 -#ifndef MIN -#define MIN(a,b) (((a)>(b)) ? (b) : (a)) -#endif - #ifndef NSIG #define NSIG 8*sizeof(sigset_t) #endif @@ -601,7 +597,7 @@ static void SignalIO(int fds, fd_set *readfds, fd_set *writefds, struct IoRequest *req; PROCESS pid; req = (struct IoRequest *) r -> BackPointer; - nfds = MIN(fds, req->nfds); + nfds = opr_min(fds, req->nfds); if (FDSetCmp(nfds, req->readfds, readfds) || FDSetCmp(nfds, req->writefds, writefds) || FDSetCmp(nfds, req->exceptfds, exceptfds)) { diff --git a/src/opr/opr.h b/src/opr/opr.h index aae17e3cbe..6bb2dc8b79 100644 --- a/src/opr/opr.h +++ b/src/opr/opr.h @@ -21,6 +21,9 @@ extern void opr_NTAbort(void); # define opr_abort() abort() #endif +#define opr_min(a, b) ((a) < (b) ? (a) : (b)) +#define opr_max(a, b) ((a) > (b) ? (a) : (b)) + extern void opr_AssertionFailed(const char *, int) AFS_NORETURN; extern void opr_AssertFailU(const char *, const char *, int) AFS_NORETURN; diff --git a/src/rx/AIX/rx_knet.c b/src/rx/AIX/rx_knet.c index 5f47ff631d..740be552d6 100644 --- a/src/rx/AIX/rx_knet.c +++ b/src/rx/AIX/rx_knet.c @@ -9,6 +9,7 @@ #include #include "afs/param.h" +#include "afs/opr.h" #ifdef AFS_AIX41_ENV @@ -406,9 +407,9 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, } /* now compute usable size */ if (M_HASCL(m)) { - len = MIN(m->m_ext.ext_size, asize); + len = opr_min(m->m_ext.ext_size, asize); } else { - len = MIN(mlen, asize); + len = opr_min(mlen, asize); } tpa = mtod(m, caddr_t); @@ -416,7 +417,7 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, mp = &m->m_next; m->m_len = 0; while (len) { - rlen = MIN(len, tl); + rlen = opr_min(len, tl); memcpy(tpa, tdata, rlen); asize -= rlen; len -= rlen; diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c index 405e35312c..99bba8dc93 100644 --- a/src/rx/DARWIN/rx_knet.c +++ b/src/rx/DARWIN/rx_knet.c @@ -9,6 +9,7 @@ #include #include "afs/param.h" +#include "afs/opr.h" #ifdef AFS_SOCKPROXY_ENV # include @@ -716,7 +717,7 @@ rx_upcall_common(socket_t so, struct afs_pkt_hdr *pkt) noffset = 0; for (i = 0; i < p->niovecs && resid > 0; i++) { - sz = MIN(resid, p->wirevec[i].iov_len); + sz = opr_min(resid, p->wirevec[i].iov_len); memcpy(p->wirevec[i].iov_base, payload, sz); resid -= sz; noffset += sz; @@ -732,7 +733,7 @@ rx_upcall_common(socket_t so, struct afs_pkt_hdr *pkt) noffset = 0; resid = nbytes; for (i=0;iniovecs && resid;i++) { - sz=MIN(resid, p->wirevec[i].iov_len); + sz=opr_min(resid, p->wirevec[i].iov_len); error = mbuf_copydata(m, offset, sz, p->wirevec[i].iov_base); if (error) break; @@ -853,7 +854,7 @@ osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec, size_t offset=0,sz; resid = *alength; for (i=0;i #include "afs/param.h" +#include "afs/opr.h" #include @@ -446,18 +447,18 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, mlen = MCLBYTES; /* now compute usable size */ - len = MIN(mlen, asize); + len = opr_min(mlen, asize); /* Should I look at MAPPED_MBUFS??? */ } else { nopages: - len = MIN(mlen, asize); + len = opr_min(mlen, asize); } m->m_len = 0; *mp = m; /* XXXX */ top->m_pkthdr.len += len; tpa = mtod(m, caddr_t); while (len) { - rlen = MIN(len, tl); + rlen = opr_min(len, tl); memcpy(tpa, tdata, rlen); asize -= rlen; len -= rlen; diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c index 788c5e268c..4fc1cbd179 100644 --- a/src/rx/IRIX/rx_knet.c +++ b/src/rx/IRIX/rx_knet.c @@ -9,7 +9,7 @@ #include #include "afs/param.h" - +#include "afs/opr.h" #include "rx/rx_kcommon.h" #include "rx/rx_packet.h" @@ -366,8 +366,8 @@ rxi_EnumGetIfInfo(struct hashbucket *h, caddr_t key, caddr_t arg1, } rxmtu = rxmtu * rxi_nRecvFrags + ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE); if (!rx_IsLoopbackAddr(ifinaddr) && (rxmtu > rx_maxReceiveSize)) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, rxmtu); - rx_maxReceiveSize = MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, rxmtu); + rx_maxReceiveSize = opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } *(int *)arg2 = i + 1; @@ -390,7 +390,7 @@ rxi_GetIFInfo() rx_maxJumboRecvSize = RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE + (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE; - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); return different; } diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index fe85e63b81..74339375fb 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -9,6 +9,7 @@ #include #include "afs/param.h" +#include "afs/opr.h" #ifdef AFS_SUN5_ENV @@ -121,9 +122,9 @@ rxi_GetIFInfo() addrs[i] = ifinaddr; if (!rx_IsLoopbackAddr(ifinaddr) && maxmtu > rx_maxReceiveSize) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxmtu); rx_maxReceiveSize = - MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } } @@ -133,7 +134,7 @@ rxi_GetIFInfo() rx_maxJumboRecvSize = RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE + (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE; - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { int j; @@ -180,9 +181,9 @@ rxi_GetIFInfo() i++; if (!rx_IsLoopbackAddr(ifinaddr) && maxmtu > rx_maxReceiveSize) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxmtu); rx_maxReceiveSize = - MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } } } @@ -190,7 +191,7 @@ rxi_GetIFInfo() rx_maxJumboRecvSize = RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE + (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE; - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { int j; diff --git a/src/rx/rx.c b/src/rx/rx.c index d6c52c369b..af717d8887 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -59,6 +59,7 @@ extern afs_int32 afs_termState; # include "sys/lock_def.h" # endif /* AFS_AIX41_ENV */ # include "afs/rxgen_consts.h" +# include #else /* KERNEL */ # include @@ -550,7 +551,7 @@ rx_InitHost(u_int host, u_int port) #endif /* RX_ENABLE_LOCKS && KERNEL */ rxi_nCalls = 0; - rx_connDeadTime = 12; + rx_connDeadTime = RX_DEFAULT_DEAD_TIME; rx_tranquil = 0; /* reset flag */ rxi_ResetStatistics(); htable = osi_Alloc(rx_hashTableSize * sizeof(struct rx_connection *)); @@ -1118,20 +1119,20 @@ rxi_CheckConnTimeouts(struct rx_connection *conn) /* a connection's timeouts must have the relationship * deadTime <= idleDeadTime <= hardDeadTime. Otherwise, for example, a * total loss of network to a peer may cause an idle timeout instead of a - * dead timeout, simply because the idle timeout gets hit first. Also set - * a minimum deadTime of 6, just to ensure it doesn't get set too low. */ + * dead timeout, simply because the idle timeout gets hit first. Also + * enforce a minimum deadTime, just to ensure it doesn't get set too low. */ /* this logic is slightly complicated by the fact that * idleDeadTime/hardDeadTime may not be set at all, but it's not too bad. */ - conn->secondsUntilDead = MAX(conn->secondsUntilDead, 6); + conn->secondsUntilDead = opr_max(conn->secondsUntilDead, RX_MINDEADTIME); if (conn->idleDeadTime) { - conn->idleDeadTime = MAX(conn->idleDeadTime, conn->secondsUntilDead); + conn->idleDeadTime = opr_max(conn->idleDeadTime, conn->secondsUntilDead); } if (conn->hardDeadTime) { if (conn->idleDeadTime) { - conn->hardDeadTime = MAX(conn->idleDeadTime, conn->hardDeadTime); + conn->hardDeadTime = opr_max(conn->idleDeadTime, conn->hardDeadTime); } else { - conn->hardDeadTime = MAX(conn->secondsUntilDead, conn->hardDeadTime); + conn->hardDeadTime = opr_max(conn->secondsUntilDead, conn->hardDeadTime); } } } @@ -1143,7 +1144,7 @@ rx_SetConnDeadTime(struct rx_connection *conn, int seconds) * keepalives to be dropped without timing out the connection. */ conn->secondsUntilDead = seconds; rxi_CheckConnTimeouts(conn); - conn->secondsUntilPing = conn->secondsUntilDead / 6; + conn->secondsUntilPing = conn->secondsUntilDead / RX_PINGS_LOST_BEFORE_DEAD; } void @@ -2898,11 +2899,11 @@ rxi_SetPeerMtu(struct rx_peer *peer, afs_uint32 host, afs_uint32 port, int mtu) MUTEX_ENTER(&peer->peer_lock); /* We don't handle dropping below min, so don't */ - mtu = MAX(mtu, RX_MIN_PACKET_SIZE); - peer->ifMTU=MIN(mtu, peer->ifMTU); + mtu = opr_max(mtu, RX_MIN_PACKET_SIZE); + peer->ifMTU=opr_min(mtu, peer->ifMTU); peer->natMTU = rxi_AdjustIfMTU(peer->ifMTU); /* if we tweaked this down, need to tune our peer MTU too */ - peer->MTU = MIN(peer->MTU, peer->natMTU); + peer->MTU = opr_min(peer->MTU, peer->natMTU); /* if we discovered a sub-1500 mtu, degrade */ if (peer->ifMTU < OLD_MAX_PACKET_SIZE) peer->maxDgramPackets = 1; @@ -4336,7 +4337,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, return np; /* truncated ack packet */ /* depends on ack packet struct */ - nAcks = MIN((unsigned)nbytes, (unsigned)ap->nAcks); + nAcks = opr_min((unsigned)nbytes, (unsigned)ap->nAcks); first = ntohl(ap->firstPacket); prev = ntohl(ap->previousPacket); serial = ntohl(ap->serial); @@ -4566,7 +4567,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, tSize = RX_MAX_PACKET_SIZE; if (tSize < RX_MIN_PACKET_SIZE) tSize = RX_MIN_PACKET_SIZE; - peer->natMTU = rxi_AdjustIfMTU(MIN(tSize, peer->ifMTU)); + peer->natMTU = rxi_AdjustIfMTU(opr_min(tSize, peer->ifMTU)); /* Get the maximum packet size to send to this peer */ rx_packetread(np, rx_AckDataSize(ap->nAcks), (int)sizeof(afs_int32), @@ -4576,7 +4577,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, tSize = RX_MAX_PACKET_SIZE; if (tSize < RX_MIN_PACKET_SIZE) tSize = RX_MIN_PACKET_SIZE; - tSize = (afs_uint32) MIN(tSize, rx_MyMaxSendSize); + tSize = (afs_uint32) opr_min(tSize, rx_MyMaxSendSize); tSize = rxi_AdjustMaxMTU(peer->natMTU, tSize); /* sanity check - peer might have restarted with different params. @@ -4587,8 +4588,8 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, if (peer->maxMTU > tSize) /* possible cong., maxMTU decreased */ peer->congestSeq++; peer->maxMTU = tSize; - peer->MTU = MIN(tSize, peer->MTU); - call->MTU = MIN(call->MTU, tSize); + peer->MTU = opr_min(tSize, peer->MTU); + call->MTU = opr_min(call->MTU, tSize); } if (np->length == rx_AckDataSize(ap->nAcks) + 3 * sizeof(afs_int32)) { @@ -4603,7 +4604,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, tSize = rx_maxSendWindow; if (tSize < call->twind) { /* smaller than our send */ call->twind = tSize; /* window, we must send less... */ - call->ssthresh = MIN(call->twind, call->ssthresh); + call->ssthresh = opr_min(call->twind, call->ssthresh); call->conn->twind[call->channel] = call->twind; } @@ -4632,7 +4633,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, if (tSize < call->twind) { call->twind = tSize; call->conn->twind[call->channel] = call->twind; - call->ssthresh = MIN(call->twind, call->ssthresh); + call->ssthresh = opr_min(call->twind, call->ssthresh); } else if (tSize > call->twind) { call->twind = tSize; call->conn->twind[call->channel] = call->twind; @@ -4648,9 +4649,9 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, rx_AckDataSize(ap->nAcks) + 3 * (int)sizeof(afs_int32), (int)sizeof(afs_int32), &tSize); maxDgramPackets = (afs_uint32) ntohl(tSize); - maxDgramPackets = MIN(maxDgramPackets, rxi_nDgramPackets); + maxDgramPackets = opr_min(maxDgramPackets, rxi_nDgramPackets); maxDgramPackets = - MIN(maxDgramPackets, (int)(peer->ifDgramPackets)); + opr_min(maxDgramPackets, (int)(peer->ifDgramPackets)); if (maxDgramPackets > 1) { peer->maxDgramPackets = maxDgramPackets; call->MTU = RX_JUMBOBUFFERSIZE + RX_HEADER_SIZE; @@ -4718,7 +4719,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, if (call->flags & RX_CALL_FAST_RECOVER) { if (newAckCount == 0) { - call->cwind = MIN((int)(call->cwind + 1), rx_maxSendWindow); + call->cwind = opr_min((int)(call->cwind + 1), rx_maxSendWindow); } else { call->flags &= ~RX_CALL_FAST_RECOVER; call->cwind = call->nextCwind; @@ -4729,10 +4730,10 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, } else if (nNacked && call->nNacks >= (u_short) rx_nackThreshold) { /* Three negative acks in a row trigger congestion recovery */ call->flags |= RX_CALL_FAST_RECOVER; - call->ssthresh = MAX(4, MIN((int)call->cwind, (int)call->twind)) >> 1; + call->ssthresh = opr_max(4, opr_min((int)call->cwind, (int)call->twind)) >> 1; call->cwind = - MIN((int)(call->ssthresh + rx_nackThreshold), rx_maxSendWindow); - call->nDgramPackets = MAX(2, (int)call->nDgramPackets) >> 1; + opr_min((int)(call->ssthresh + rx_nackThreshold), rx_maxSendWindow); + call->nDgramPackets = opr_max(2, (int)call->nDgramPackets) >> 1; call->nextCwind = call->ssthresh; call->nAcks = 0; call->nNacks = 0; @@ -4767,13 +4768,13 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, * receive (linear growth). */ if (call->cwind < call->ssthresh) { call->cwind = - MIN((int)call->ssthresh, (int)(call->cwind + newAckCount)); + opr_min((int)call->ssthresh, (int)(call->cwind + newAckCount)); call->nCwindAcks = 0; } else { call->nCwindAcks += newAckCount; if (call->nCwindAcks >= call->cwind) { call->nCwindAcks = 0; - call->cwind = MIN((int)(call->cwind + 1), rx_maxSendWindow); + call->cwind = opr_min((int)(call->cwind + 1), rx_maxSendWindow); } } /* @@ -4792,7 +4793,7 @@ rxi_ReceiveAckPacket(struct rx_call *call, struct rx_packet *np, call->MTU = peer->ifMTU; else { call->MTU += peer->natMTU; - call->MTU = MIN(call->MTU, peer->maxMTU); + call->MTU = opr_min(call->MTU, peer->maxMTU); } } call->nAcks = 0; @@ -5419,10 +5420,10 @@ rxi_ResetCall(struct rx_call *call, int newcall) MUTEX_ENTER(&peer->peer_lock); if (!newcall) { if (call->congestSeq == peer->congestSeq) { - peer->cwind = MAX(peer->cwind, call->cwind); - peer->MTU = MAX(peer->MTU, call->MTU); + peer->cwind = opr_max(peer->cwind, call->cwind); + peer->MTU = opr_max(peer->MTU, call->MTU); peer->nDgramPackets = - MAX(peer->nDgramPackets, call->nDgramPackets); + opr_max(peer->nDgramPackets, call->nDgramPackets); } } else { call->abortCode = 0; @@ -5433,7 +5434,7 @@ rxi_ResetCall(struct rx_call *call, int newcall) } else { call->MTU = peer->MTU; } - call->cwind = MIN((int)peer->cwind, (int)peer->nDgramPackets); + call->cwind = opr_min((int)peer->cwind, (int)peer->nDgramPackets); call->ssthresh = rx_maxSendWindow; call->nDgramPackets = peer->nDgramPackets; call->congestSeq = peer->congestSeq; @@ -5441,7 +5442,7 @@ rxi_ResetCall(struct rx_call *call, int newcall) call->rtt_dev = peer->rtt_dev; clock_Zero(&call->rto); clock_Addmsec(&call->rto, - MAX(((call->rtt >> 3) + call->rtt_dev), rx_minPeerTimeout) + 200); + opr_max(((call->rtt >> 3) + call->rtt_dev), rx_minPeerTimeout) + 200); MUTEX_EXIT(&peer->peer_lock); flags = call->flags; @@ -5587,7 +5588,7 @@ rxi_SendAck(struct rx_call *call, padbytes = call->conn->peer->maxMTU + 128; /* do always try a minimum size ping */ - padbytes = MAX(padbytes, RX_MIN_PACKET_SIZE+RX_IPUDP_SIZE+4); + padbytes = opr_max(padbytes, RX_MIN_PACKET_SIZE+RX_IPUDP_SIZE+4); /* subtract the ack payload */ padbytes -= (rx_AckDataSize(call->rwind) + 4 * sizeof(afs_int32)); @@ -6133,9 +6134,9 @@ rxi_Resend(struct rxevent *event, void *arg0, void *arg1, int istack) * and start again from the beginning */ if (peer->maxDgramPackets >1) { call->MTU = RX_JUMBOBUFFERSIZE + RX_HEADER_SIZE; - call->MTU = MIN(peer->natMTU, peer->maxMTU); + call->MTU = opr_min(peer->natMTU, peer->maxMTU); } - call->ssthresh = MAX(4, MIN((int)call->cwind, (int)call->twind)) >> 1; + call->ssthresh = opr_max(4, opr_min((int)call->cwind, (int)call->twind)) >> 1; call->nDgramPackets = 1; call->cwind = 1; call->nextCwind = 1; @@ -6205,7 +6206,7 @@ rxi_Start(struct rx_call *call, int istack) call->flags &= ~RX_CALL_NEED_START; #endif /* RX_ENABLE_LOCKS */ nXmitPackets = 0; - maxXmitPackets = MIN(call->twind, call->cwind); + maxXmitPackets = opr_min(call->twind, call->cwind); for (opr_queue_Scan(&call->tq, cursor)) { struct rx_packet *p = opr_queue_Entry(cursor, struct rx_packet, entry); @@ -6222,7 +6223,7 @@ rxi_Start(struct rx_call *call, int istack) p->header.flags &= RX_PRESET_FLAGS; if (p->header.seq >= - call->tfirst + MIN((int)call->twind, + call->tfirst + opr_min((int)call->twind, (int)(call->nSoftAcked + call->cwind))) { call->flags |= RX_CALL_WAIT_WINDOW_SEND; /* Wait for transmit window */ @@ -6398,9 +6399,9 @@ rxi_CheckCall(struct rx_call *call, int haveCTLock) if (now < call->lastSendTime) clock_diff = call->lastSendTime - now; if (now < call->startWait) - clock_diff = MAX(clock_diff, call->startWait - now); + clock_diff = opr_max(clock_diff, call->startWait - now); if (now < call->lastReceiveTime) - clock_diff = MAX(clock_diff, call->lastReceiveTime - now); + clock_diff = opr_max(clock_diff, call->lastReceiveTime - now); if (clock_diff > 5 * 60) { if (call->state == RX_STATE_ACTIVE) @@ -6490,7 +6491,7 @@ mtuout: * Shrink by 128 bytes and try again. */ if (conn->peer->maxPacketSize < conn->lastPacketSize) /* maxPacketSize will be cleared in rxi_SetPeerMtu */ - newmtu = MAX(conn->peer->maxPacketSize + RX_HEADER_SIZE, + newmtu = opr_max(conn->peer->maxPacketSize + RX_HEADER_SIZE, conn->lastPacketSize - 128 + RX_HEADER_SIZE); else newmtu = conn->lastPacketSize - 128 + RX_HEADER_SIZE; @@ -6723,10 +6724,10 @@ rxi_ScheduleGrowMTUEvent(struct rx_call *call, int secs) when = now; if (!secs) { if (call->conn->secondsUntilPing) - secs = (6*call->conn->secondsUntilPing)-1; + secs = (RX_PINGS_LOST_BEFORE_DEAD * call->conn->secondsUntilPing)-1; if (call->conn->secondsUntilDead) - secs = MIN(secs, (call->conn->secondsUntilDead-1)); + secs = opr_min(secs, (call->conn->secondsUntilDead-1)); } when.sec += secs; @@ -7101,7 +7102,7 @@ rxi_ComputeRoundTripTime(struct rx_packet *p, * add on a fixed 200ms to account for that timer expiring. */ - rtt_timeout = MAX(((call->rtt >> 3) + call->rtt_dev), + rtt_timeout = opr_max(((call->rtt >> 3) + call->rtt_dev), rx_minPeerTimeout) + 200; clock_Zero(&call->rto); clock_Addmsec(&call->rto, rtt_timeout); diff --git a/src/rx/rx.h b/src/rx/rx.h index ee1331e850..f9a387db63 100644 --- a/src/rx/rx.h +++ b/src/rx/rx.h @@ -163,7 +163,19 @@ extern u_short rx_PortOf(struct rx_peer *peer); /* Configurable parameters */ #define RX_IDLE_DEAD_TIME 60 /* default idle dead time */ +#define RX_DEFAULT_DEAD_TIME 12 /* Default timeout for an unresponsive connection */ #define RX_MAX_SERVICES 20 /* Maximum number of services that may be installed */ +/* + * The number of consecutive keepalives (ping acks) that must be lost/missing + * before declaring an rx_call dead timeout (RX_CALL_DEAD). This number was + * chosen to be relatively small while allowing for "several" pings to be lost + * without triggering a timeout. (We are running on UDP after all). Since the + * miniumum non-zero secondsUntilPing is 1 second, this also determines the + * minimum rx dead time. + */ +#define RX_PINGS_LOST_BEFORE_DEAD 6 +#define RX_MINDEADTIME (RX_PINGS_LOST_BEFORE_DEAD * 1) + #if defined(KERNEL) && defined(AFS_AIX51_ENV) && defined(__64__) # define RX_DEFAULT_STACK_SIZE 24000 #else diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c index 5bf7ed9c98..2420b04681 100644 --- a/src/rx/rx_getaddr.c +++ b/src/rx/rx_getaddr.c @@ -10,6 +10,8 @@ #include #include +#include "afs/opr.h" + #ifndef KERNEL # include @@ -104,10 +106,6 @@ rxi_getaddr(void) #if !defined(KERNEL) || defined(UKERNEL) -#ifndef MAX -#define MAX(A,B) (((A)<(B)) ? (B) : (A)) -#endif - #ifdef UKERNEL #undef ioctl #endif /* UKERNEL */ @@ -409,7 +407,7 @@ rx_getAllAddr_internal(afs_uint32 buffer[], int maxSize, int loopbacks) #ifdef AFS_AIX51_ENV cp = cpnext #else - cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a)) + cp += sizeof(ifr->ifr_name) + opr_max(a->sin_len, sizeof(*a)) #endif #endif ) @@ -424,7 +422,7 @@ rx_getAllAddr_internal(afs_uint32 buffer[], int maxSize, int loopbacks) #endif a = (struct sockaddr_in *)&ifr->ifr_addr; #ifdef AFS_AIX51_ENV - cpnext = cp + sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a)); + cpnext = cp + sizeof(ifr->ifr_name) + opr_max(a->sin_len, sizeof(*a)); #endif if (a->sin_family != AF_INET) continue; @@ -507,7 +505,7 @@ rx_getAllAddrMaskMtu(afs_uint32 addrBuffer[], afs_uint32 maskBuffer[], ifc.ifc_len = sizeof(ifs); for (cp = (char *)ifc.ifc_buf, cplim = ifc.ifc_buf + ifc.ifc_len; cp < cplim; - cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a))) { + cp += sizeof(ifr->ifr_name) + opr_max(a->sin_len, sizeof(*a))) { ifr = (struct ifreq *)cp; #else for (i = 0; i < len; ++i) { diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h index caf0d3bc9b..5326af0744 100644 --- a/src/rx/rx_globals.h +++ b/src/rx/rx_globals.h @@ -65,7 +65,7 @@ EXT int rx_extraPackets GLOBALSINIT(256); EXT int rx_stackSize GLOBALSINIT(RX_DEFAULT_STACK_SIZE); /* Time until an unresponsive connection is declared dead */ -EXT int rx_connDeadTime GLOBALSINIT(12); +EXT int rx_connDeadTime GLOBALSINIT(RX_DEFAULT_DEAD_TIME); /* Set rx default connection dead time; set on both services and connections at creation time */ #ifdef AFS_NT40_ENV @@ -295,7 +295,7 @@ EXT int rx_TSFPQMaxProcs GLOBALSINIT(0); /* max number of threads expected */ do { \ int i; \ struct rx_packet * p; \ - int tsize = MIN((rx_ts_info_p)->_FPQ.len, (rx_ts_info_p)->_FPQ.len - rx_TSFPQLocalMax + 3 * rx_TSFPQGlobSize); \ + int tsize = opr_min((rx_ts_info_p)->_FPQ.len, (rx_ts_info_p)->_FPQ.len - rx_TSFPQLocalMax + 3 * rx_TSFPQGlobSize); \ if (tsize <= 0) break; \ for (i=0,p=opr_queue_Last(&((rx_ts_info_p)->_FPQ.queue), \ struct rx_packet, entry); \ diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index c90df3d365..f29bd56f05 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -21,6 +21,7 @@ #include "rx_internal.h" #include "rx_stats.h" #include "rx_peer.h" +#include "afs/opr.h" #ifdef AFS_HPUX110_ENV # include "h/tihdr.h" @@ -372,10 +373,10 @@ rxi_InitPeerParams(struct rx_peer *pp) i = rxi_Findcbi(pp->host); if (i == -1) { rx_rto_setPeerTimeoutSecs(pp, 3); - pp->ifMTU = MIN(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); } else { rx_rto_setPeerTimeoutSecs(pp, 2); - pp->ifMTU = MIN(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); mtu = ntohl(afs_cb_interface.mtu[i]); /* Diminish the packet size to one based on the MTU given by * the interface. */ @@ -398,7 +399,7 @@ rxi_InitPeerParams(struct rx_peer *pp) ifn = rxi_FindIfnet(pp->host, NULL); if (ifn) { rx_rto_setPeerTimeoutSecs(pp, 2); - pp->ifMTU = MIN(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); # ifdef IFF_POINTOPOINT if (rx_ifnet_flags(ifn) & IFF_POINTOPOINT) { /* wish we knew the bit rate and the chunk size, sigh. */ @@ -415,7 +416,7 @@ rxi_InitPeerParams(struct rx_peer *pp) } } else { /* couldn't find the interface, so assume the worst */ rx_rto_setPeerTimeoutSecs(pp, 3); - pp->ifMTU = MIN(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); } RX_NET_EPOCH_EXIT(); @@ -428,10 +429,10 @@ rxi_InitPeerParams(struct rx_peer *pp) if (mtu <= 0) { rx_rto_setPeerTimeoutSecs(pp, 3); - pp->ifMTU = MIN(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); } else { rx_rto_setPeerTimeoutSecs(pp, 2); - pp->ifMTU = MIN(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); + pp->ifMTU = opr_min(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); /* Diminish the packet size to one based on the MTU given by * the interface. */ @@ -444,14 +445,14 @@ rxi_InitPeerParams(struct rx_peer *pp) #endif /* AFS_SUN5_ENV */ pp->ifMTU = rxi_AdjustIfMTU(pp->ifMTU); pp->maxMTU = OLD_MAX_PACKET_SIZE; /* for compatibility with old guys */ - pp->natMTU = MIN(pp->ifMTU, OLD_MAX_PACKET_SIZE); + pp->natMTU = opr_min(pp->ifMTU, OLD_MAX_PACKET_SIZE); pp->ifDgramPackets = - MIN(rxi_nDgramPackets, + opr_min(rxi_nDgramPackets, rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->maxDgramPackets = 1; /* Initialize slow start parameters */ - pp->MTU = MIN(pp->natMTU, pp->maxMTU); + pp->MTU = opr_min(pp->natMTU, pp->maxMTU); pp->cwind = 1; pp->nDgramPackets = 1; pp->congestSeq = 0; @@ -520,15 +521,15 @@ rxi_GetcbiInfo(void) maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu); addrs[i++] = ifinaddr; if (!rx_IsLoopbackAddr(ifinaddr) && (maxmtu > rx_maxReceiveSize)) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu); - rx_maxReceiveSize = MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxmtu); + rx_maxReceiveSize = opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } } rx_maxJumboRecvSize = RX_HEADER_SIZE + (rxi_nDgramPackets * RX_JUMBOBUFFERSIZE) + ((rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE); - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { for (j = 0; j < i; j++) { @@ -648,9 +649,9 @@ rxi_GetIFInfo(void) if (!rx_IsLoopbackAddr(ifinaddr) && (maxmtu > rx_maxReceiveSize)) { rx_maxReceiveSize = - MIN(RX_MAX_PACKET_SIZE, maxmtu); + opr_min(RX_MAX_PACKET_SIZE, maxmtu); rx_maxReceiveSize = - MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } cnt++; } @@ -710,9 +711,9 @@ rxi_GetIFInfo(void) maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu); addrs[i++] = ifinaddr; if (!rx_IsLoopbackAddr(ifinaddr) && (maxmtu > rx_maxReceiveSize)) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxmtu); rx_maxReceiveSize = - MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } } } @@ -725,7 +726,7 @@ rxi_GetIFInfo(void) rx_maxJumboRecvSize = RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE + (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE; - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { int l; @@ -1084,7 +1085,7 @@ afs_rxevent_daemon(void) "before afs_osi_Wait()"); # endif # ifdef RXK_TIMEDSLEEP_ENV - afs_osi_TimedSleep(&afs_termState, MAX(500, ((temp.sec * 1000) + + afs_osi_TimedSleep(&afs_termState, opr_max(500, ((temp.sec * 1000) + (temp.usec / 1000))), 0); # else afs_osi_Wait(500, NULL, 0); diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 2898da1899..693d7c0d96 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -43,7 +43,6 @@ #else /* KERNEL */ # include # include -# include # if defined(AFS_NT40_ENV) # ifndef EWOULDBLOCK # define EWOULDBLOCK WSAEWOULDBLOCK @@ -58,6 +57,8 @@ # include #endif + +#include #include #include "rx.h" @@ -194,7 +195,7 @@ rx_SlowReadPacket(struct rx_packet * packet, unsigned int offset, int resid, */ r = resid; while ((r > 0) && (i < packet->niovecs)) { - j = MIN(r, packet->wirevec[i].iov_len - (offset - l)); + j = opr_min(r, packet->wirevec[i].iov_len - (offset - l)); memcpy(out, (char *)(packet->wirevec[i].iov_base) + (offset - l), j); r -= j; out += j; @@ -237,7 +238,7 @@ rx_SlowWritePacket(struct rx_packet * packet, int offset, int resid, char *in) break; b = (char *)(packet->wirevec[i].iov_base) + (offset - l); - j = MIN(r, packet->wirevec[i].iov_len - (offset - l)); + j = opr_min(r, packet->wirevec[i].iov_len - (offset - l)); memcpy(b, in, j); r -= j; in += j; @@ -277,7 +278,7 @@ AllocPacketBufs(int class, int num_pkts, struct opr_queue * q) if (transfer > 0) { NETPRI; MUTEX_ENTER(&rx_freePktQ_lock); - transfer = MAX(transfer, rx_TSFPQGlobSize); + transfer = opr_max(transfer, rx_TSFPQGlobSize); if (transfer > rx_nFreePackets) { /* alloc enough for us, plus a few globs for other threads */ rxi_MorePacketsNoLock(transfer + 4 * rx_initSendWindow); @@ -344,7 +345,7 @@ AllocPacketBufs(int class, int num_pkts, struct opr_queue * q) } #else /* KERNEL */ if (rx_nFreePackets < num_pkts) { - rxi_MorePacketsNoLock(MAX((num_pkts-rx_nFreePackets), 4 * rx_initSendWindow)); + rxi_MorePacketsNoLock(opr_max((num_pkts-rx_nFreePackets), 4 * rx_initSendWindow)); } #endif /* KERNEL */ @@ -826,7 +827,7 @@ rxi_AdjustLocalPacketsTSFPQ(int num_keep_local, int allow_overcommit) if ((num_keep_local > rx_TSFPQLocalMax) && !allow_overcommit) xfer = rx_TSFPQLocalMax - rx_ts_info->_FPQ.len; if (rx_nFreePackets < xfer) { - rxi_MorePacketsNoLock(MAX(xfer - rx_nFreePackets, 4 * rx_initSendWindow)); + rxi_MorePacketsNoLock(opr_max(xfer - rx_nFreePackets, 4 * rx_initSendWindow)); } RX_TS_FPQ_GTOL2(rx_ts_info, xfer); } @@ -922,7 +923,7 @@ rxi_FreeDataBufsToQueue(struct rx_packet *p, afs_uint32 first, struct opr_queue struct rx_packet * cb; int count = 0; - for (first = MAX(2, first); first < p->niovecs; first++, count++) { + for (first = opr_max(2, first); first < p->niovecs; first++, count++) { iov = &p->wirevec[first]; if (!iov->iov_base) osi_Panic("rxi_FreeDataBufsToQueue: unexpected NULL iov"); @@ -950,7 +951,7 @@ rxi_FreeDataBufsNoLock(struct rx_packet *p, afs_uint32 first) { struct iovec *iov; - for (first = MAX(2, first); first < p->niovecs; first++) { + for (first = opr_max(2, first); first < p->niovecs; first++) { iov = &p->wirevec[first]; if (!iov->iov_base) osi_Panic("rxi_FreeDataBufsNoLock: unexpected NULL iov"); @@ -985,7 +986,7 @@ rxi_FreeDataBufsTSFPQ(struct rx_packet *p, afs_uint32 first, int flush_global) RX_TS_INFO_GET(rx_ts_info); - for (first = MAX(2, first); first < p->niovecs; first++) { + for (first = opr_max(2, first); first < p->niovecs; first++) { iov = &p->wirevec[first]; if (!iov->iov_base) osi_Panic("rxi_FreeDataBufsTSFPQ: unexpected NULL iov"); @@ -1333,7 +1334,7 @@ rxi_AllocSendPacket(struct rx_call *call, int want) #ifdef RX_ENABLE_TSFPQ if ((p = rxi_AllocPacketTSFPQ(RX_PACKET_CLASS_SEND, 0))) { want += delta; - want = MIN(want, mud); + want = opr_min(want, mud); if ((unsigned)want > p->length) (void)rxi_AllocDataBuf(p, (want - p->length), @@ -1359,7 +1360,7 @@ rxi_AllocSendPacket(struct rx_call *call, int want) MUTEX_EXIT(&rx_freePktQ_lock); want += delta; - want = MIN(want, mud); + want = opr_min(want, mud); if ((unsigned)want > p->length) (void)rxi_AllocDataBuf(p, (want - p->length), @@ -1646,7 +1647,7 @@ cpytoc(mblk_t * mp, int off, int len, char *cp) if (mp->b_datap->db_type != M_DATA) { return -1; } - n = MIN(len, (mp->b_wptr - mp->b_rptr)); + n = opr_min(len, (mp->b_wptr - mp->b_rptr)); memcpy(cp, (char *)mp->b_rptr, n); cp += n; len -= n; @@ -1669,7 +1670,7 @@ cpytoiovec(mblk_t * mp, int off, int len, struct iovec *iovs, if (mp->b_datap->db_type != M_DATA) { return -1; } - n = MIN(len, (mp->b_wptr - mp->b_rptr)); + n = opr_min(len, (mp->b_wptr - mp->b_rptr)); len -= n; while (n) { if (!t) { @@ -1677,7 +1678,7 @@ cpytoiovec(mblk_t * mp, int off, int len, struct iovec *iovs, i++; t = iovs[i].iov_len; } - m = MIN(n, t); + m = opr_min(n, t); memcpy(iovs[i].iov_base + o, (char *)mp->b_rptr, m); mp->b_rptr += m; o += m; @@ -1719,7 +1720,7 @@ m_cpytoiovec(struct mbuf *m, int off, int len, struct iovec iovs[], int niovs) l2 = iovs[0].iov_len; while (len) { - t = MIN(l1, MIN(l2, (unsigned int)len)); + t = opr_min(l1, opr_min(l2, (unsigned int)len)); memcpy(p2, p1, t); p1 += t; p2 += t; @@ -2860,7 +2861,7 @@ int rxi_AdjustMaxMTU(int mtu, int peerMaxMTU) { int maxMTU = mtu * rxi_nSendFrags; - maxMTU = MIN(maxMTU, peerMaxMTU); + maxMTU = opr_min(maxMTU, peerMaxMTU); return rxi_AdjustIfMTU(maxMTU); } @@ -2876,7 +2877,7 @@ rxi_AdjustDgramPackets(int frags, int mtu) return 1; } maxMTU = (frags * (mtu + UDP_HDR_SIZE)) - UDP_HDR_SIZE; - maxMTU = MIN(maxMTU, RX_MAX_PACKET_SIZE); + maxMTU = opr_min(maxMTU, RX_MAX_PACKET_SIZE); /* subtract the size of the first and last packets */ maxMTU -= RX_HEADER_SIZE + (2 * RX_JUMBOBUFFERSIZE) + RX_JUMBOHEADERSIZE; if (maxMTU < 0) { diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index 46c07895d5..48736d3f8f 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -32,14 +32,7 @@ */ -#if defined(AFS_NT40_ENV) -# ifndef MIN -# define MIN(a,b) ((a)<(b)?(a):(b)) -# endif -# ifndef MAX -# define MAX(a,b) ((a)>(b)?(a):(b)) -# endif -#else /* AFS_NT40_ENV */ +#if !defined(AFS_NT40_ENV) # if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) \ && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) \ && !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX_ENV) @@ -316,7 +309,7 @@ struct rx_packet { /* return what the actual contiguous space is: should be min(length,size) */ /* The things that call this really want something like ...pullup MTUXXX */ #define rx_Contiguous(p) \ - MIN((unsigned) (p)->length, (unsigned) ((p)->wirevec[1].iov_len)) + opr_min((unsigned) (p)->length, (unsigned) ((p)->wirevec[1].iov_len)) #ifndef TRUE #define TRUE 1 diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index ee1c3e3d43..2bc75cb496 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -50,9 +50,9 @@ # include "afs/lock.h" #else /* KERNEL */ # include -# include #endif /* KERNEL */ +#include #include "rx.h" #include "rx_clock.h" #include "rx_globals.h" @@ -252,8 +252,8 @@ rxi_ReadProc(struct rx_call *call, char *buf, * the final portion of a received packet, it's almost certain that * call->app.nLeft will be smaller than the final buffer. */ while (nbytes && call->app.currentPacket) { - t = MIN((int)call->app.curlen, nbytes); - t = MIN(t, (int)call->app.nLeft); + t = opr_min((int)call->app.curlen, nbytes); + t = opr_min(t, (int)call->app.nLeft); memcpy(buf, call->app.curpos, t); buf += t; nbytes -= t; @@ -428,8 +428,8 @@ rxi_FillReadVec(struct rx_call *call, afs_uint32 serial) && call->iovNext < call->iovMax && call->app.currentPacket) { - t = MIN((int)call->app.curlen, call->iovNBytes); - t = MIN(t, (int)call->app.nLeft); + t = opr_min((int)call->app.curlen, call->iovNBytes); + t = opr_min(t, (int)call->app.nLeft); call_iov->iov_base = call->app.curpos; call_iov->iov_len = t; call_iov++; @@ -724,7 +724,7 @@ rxi_WriteProc(struct rx_call *call, char *buf, mud = rx_MaxUserDataSize(call); if (mud > len) { int want; - want = MIN(nbytes - (int)call->app.nFree, mud - len); + want = opr_min(nbytes - (int)call->app.nFree, mud - len); rxi_AllocDataBuf(call->app.currentPacket, want, RX_PACKET_CLASS_SEND_CBUF); if (call->app.currentPacket->length > (unsigned)mud) @@ -743,8 +743,8 @@ rxi_WriteProc(struct rx_call *call, char *buf, while (nbytes && call->app.nFree) { - t = MIN((int)call->app.curlen, nbytes); - t = MIN((int)call->app.nFree, t); + t = opr_min((int)call->app.curlen, nbytes); + t = opr_min((int)call->app.nFree, t); memcpy(call->app.curpos, buf, t); buf += t; nbytes -= t; @@ -952,7 +952,7 @@ rxi_WritevAlloc(struct rx_call *call, struct iovec *iov, int *nio, int maxio, mud = rx_MaxUserDataSize(call); if (mud > len) { int want; - want = MIN(nbytes - tnFree, mud - len); + want = opr_min(nbytes - tnFree, mud - len); rxi_AllocDataBuf(cp, want, RX_PACKET_CLASS_SEND_CBUF); if (cp->length > (unsigned)mud) cp->length = mud; @@ -964,8 +964,8 @@ rxi_WritevAlloc(struct rx_call *call, struct iovec *iov, int *nio, int maxio, } /* fill in the next entry in the iovec */ - t = MIN(tcurlen, nbytes); - t = MIN(tnFree, t); + t = opr_min(tcurlen, nbytes); + t = opr_min(tnFree, t); iov[nextio].iov_base = tcurpos; iov[nextio].iov_len = t; nbytes -= t; diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 15695265ec..1effe0a198 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -404,12 +404,12 @@ rx_GetIFInfo(void) rxi_nRecvFrags * rxsize + (rxi_nRecvFrags - 1) * UDP_HDR_SIZE; maxsize = rxi_AdjustMaxMTU(rxsize, maxsize); if (rx_maxReceiveSize > maxsize) { - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxsize); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxsize); rx_maxReceiveSize = - MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); + opr_min(rx_maxReceiveSize, rx_maxReceiveSizeUser); } if (rx_MyMaxSendSize > maxsize) { - rx_MyMaxSendSize = MIN(RX_MAX_PACKET_SIZE, maxsize); + rx_MyMaxSendSize = opr_min(RX_MAX_PACKET_SIZE, maxsize); } } UNLOCK_IF; @@ -517,10 +517,10 @@ rx_GetIFInfo(void) LOCK_IF; #ifdef AFS_AIX41_ENV -#define size(p) MAX((p).sa_len, sizeof(p)) +#define size(p) opr_max((p).sa_len, sizeof(p)) cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */ for (cp = buf; cp < cplim; - cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a))) { + cp += sizeof(ifr->ifr_name) + opr_max(a->sin_len, sizeof(*a))) { if (rxi_numNetAddrs >= ADDRSPERSITE) break; @@ -642,7 +642,7 @@ rx_GetIFInfo(void) rxi_nRecvFrags * (myNetMTUs[rxi_numNetAddrs] - RX_IP_SIZE); maxsize -= UDP_HDR_SIZE; /* only the first frag has a UDP hdr */ if (rx_maxReceiveSize < maxsize) - rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxsize); + rx_maxReceiveSize = opr_min(RX_MAX_PACKET_SIZE, maxsize); ++rxi_numNetAddrs; } } @@ -658,7 +658,7 @@ rx_GetIFInfo(void) rx_maxJumboRecvSize = RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE + (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE; - rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); + rx_maxJumboRecvSize = opr_max(rx_maxJumboRecvSize, rx_maxReceiveSize); ncbufs = (rx_maxJumboRecvSize - RX_FIRSTBUFFERSIZE); if (ncbufs > 0) { ncbufs = ncbufs / RX_CBUFFERSIZE; @@ -721,13 +721,13 @@ rxi_InitPeerParams(struct rx_peer *pp) if (rxmtu < RX_MIN_PACKET_SIZE) rxmtu = RX_MIN_PACKET_SIZE; if (pp->ifMTU < rxmtu) - pp->ifMTU = MIN(rx_MyMaxSendSize, rxmtu); + pp->ifMTU = opr_min(rx_MyMaxSendSize, rxmtu); } } UNLOCK_IF; if (!pp->ifMTU) { /* not local */ rx_rto_setPeerTimeoutSecs(pp, 3); - pp->ifMTU = MIN(rx_MyMaxSendSize, RX_REMOTE_PACKET_SIZE); + pp->ifMTU = opr_min(rx_MyMaxSendSize, RX_REMOTE_PACKET_SIZE); } #ifdef AFS_ADAPT_PMTU sock=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -740,7 +740,7 @@ rxi_InitPeerParams(struct rx_peer *pp) int mtu=0; socklen_t s = sizeof(mtu); if (getsockopt(sock, SOL_IP, IP_MTU, &mtu, &s)== 0) { - pp->ifMTU = MIN(mtu - RX_IPUDP_SIZE, pp->ifMTU); + pp->ifMTU = opr_min(mtu - RX_IPUDP_SIZE, pp->ifMTU); } } # ifdef AFS_NT40_ENV @@ -752,16 +752,16 @@ rxi_InitPeerParams(struct rx_peer *pp) #endif pp->ifMTU = rxi_AdjustIfMTU(pp->ifMTU); pp->maxMTU = OLD_MAX_PACKET_SIZE; /* for compatibility with old guys */ - pp->natMTU = MIN((int)pp->ifMTU, OLD_MAX_PACKET_SIZE); + pp->natMTU = opr_min((int)pp->ifMTU, OLD_MAX_PACKET_SIZE); pp->maxDgramPackets = - MIN(rxi_nDgramPackets, + opr_min(rxi_nDgramPackets, rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->ifDgramPackets = - MIN(rxi_nDgramPackets, + opr_min(rxi_nDgramPackets, rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->maxDgramPackets = 1; /* Initialize slow start parameters */ - pp->MTU = MIN(pp->natMTU, pp->maxMTU); + pp->MTU = opr_min(pp->natMTU, pp->maxMTU); pp->cwind = 1; pp->nDgramPackets = 1; pp->congestSeq = 0; diff --git a/src/rxkad/crypt_conn.c b/src/rxkad/crypt_conn.c index da708bcd72..10ba5d84c1 100644 --- a/src/rxkad/crypt_conn.c +++ b/src/rxkad/crypt_conn.c @@ -27,9 +27,9 @@ #endif /* !UKERNEL */ #else /* !KERNEL */ #include -#include #endif /* KERNEL */ +#include #include #include #include @@ -58,7 +58,7 @@ rxkad_DecryptPacket(const struct rx_connection *conn, data = rx_data(packet, i, tlen); if (!data || !tlen) break; - tlen = MIN(len, tlen); + tlen = opr_min(len, tlen); fc_cbc_encrypt(data, data, tlen, *schedule, xor, DECRYPT); len -= tlen; } @@ -99,7 +99,7 @@ rxkad_EncryptPacket(const struct rx_connection * conn, data = rx_data(packet, i, tlen); if (!data || !tlen) break; - tlen = MIN(len, tlen); + tlen = opr_min(len, tlen); fc_cbc_encrypt(data, data, tlen, *schedule, xor, ENCRYPT); len -= tlen; } diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index 630488374a..1f760b8c0e 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -33,10 +33,9 @@ #endif /* !UKERNEL */ #else /* ! KERNEL */ #include -#include #endif /* KERNEL */ - +#include #include #include #include diff --git a/src/uss/grammar.y b/src/uss/grammar.y index 77a927ec8e..186c6c6cc3 100644 --- a/src/uss/grammar.y +++ b/src/uss/grammar.y @@ -123,12 +123,20 @@ entry : DIR_TKN accesslist : /* empty */ - {strcpy($$," ");} + { + if (strlcpy($$, " ", sizeof($$)) >= sizeof($$)) { + uss_procs_PrintErr(line-1, "Internal error, incorrect size for accesslist buffer\n"); + exit(1); + } + } | STRING_TKN STRING_TKN accesslist - {strcat($1," "); strcat($2," ");strcat($1,strcat($2,$3));strcpy($$,$1);} - + { + if (snprintf($$, sizeof($$), "%s %s %s", $1, $2, $3) >= sizeof($$)) { + uss_procs_PrintErr(line-1, " error in access list near \"%s\"\n", yylval.strval); + } + } ; %%