From 06c7142d571dc7392f1409c8f18b8af8b2a26de4 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 13 Jan 2005 08:05:20 +0000 Subject: [PATCH] Get rid of the VDESC() macro while the pot is boiling anyway, it is only used from generate files now, so we might as well generate the right stuff from the start. --- sys/sys/vnode.h | 1 - sys/tools/vnode_if.awk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 8b75ce7ee0b4..2974f2f3dc8f 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -525,7 +525,6 @@ void vop_unlock_pre(void *a); * This call works for vnodes in the kernel. */ #define VCALL(c) ((c)->a_desc->vdesc_call(c)) -#define VDESC(OP) (& __CONCAT(OP,_desc)) /* * VMIO support inline diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 547458932fcb..7acf145264a7 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -315,7 +315,7 @@ while ((getline < srcfile) > 0) { printh("{"); printh("\tstruct " name "_args a;"); printh(""); - printh("\ta.a_gen.a_desc = VDESC(" name ");"); + printh("\ta.a_gen.a_desc = &" name "_desc;"); for (i = 0; i < numargs; ++i) printh("\ta.a_" args[i] " = " args[i] ";"); printh("\treturn (" uname "_AP(&a));"); @@ -354,7 +354,7 @@ while ((getline < srcfile) > 0) { printc("\tstruct vnode *vp = a->a_" args[0]";"); printc("\tstruct vop_vector *vop = vp->v_op;"); printc(""); - printc("\tKASSERT(a->a_gen.a_desc == VDESC(" name "),"); + printc("\tKASSERT(a->a_gen.a_desc == &" name "_desc,"); printc("\t (\"Wrong a_desc in " name "(%p, %p)\", vp, a));"); printc("\twhile(vop != NULL && \\"); printc("\t vop->"name" == NULL && vop->vop_bypass == NULL)")