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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
#include <sys/lock.h>
+#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