diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 8b75ce7ee0b..2974f2f3dc8 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 547458932fc..7acf145264a 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)")