From 03ac7bd100d93f2f47b5e3724c61e3d93a9eca56 Mon Sep 17 00:00:00 2001 From: Antoine Verheijen Date: Mon, 8 Feb 2010 15:07:09 -0700 Subject: [PATCH] OpenBSD: move AFS memory type offet The internal malloc memory types for IPv6 (M_IP6OPT, ...) conflict with the type numbers used to designate AFS memory (M_AFSFID, etc.). This change moves the AFS memory type to a new number that does not conflict. This is not a serious issue but can create real confusion when trying to debug or track memory issues, among other things. Change-Id: Icccaa7c06443cab008013414cb3c2ab4ea08889e Reviewed-on: http://gerrit.openafs.org/1271 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/OBSD/osi_machdep.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h index ebca62df7..5e03708d4 100644 --- a/src/afs/OBSD/osi_machdep.h +++ b/src/afs/OBSD/osi_machdep.h @@ -23,10 +23,15 @@ #include +#if defined(M_IP6OPT) +#define M_AFSFID (M_IP6OPT-1) +#else #define M_AFSFID (M_TEMP-1) -#define M_AFSBUFHDR (M_TEMP-2) -#define M_AFSBUFFER (M_TEMP-3) -#define M_AFSGENERIC (M_TEMP-4) +#endif + +#define M_AFSBUFHDR (M_AFSFID-1) +#define M_AFSBUFFER (M_AFSFID-2) +#define M_AFSGENERIC (M_AFSFID-3) /* vfs */ #define osi_vfs mount -- 2.39.5