diff options
| author | phk <phk@FreeBSD.org> | 2005-01-13 08:05:20 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2005-01-13 08:05:20 +0000 |
| commit | 06c7142d571dc7392f1409c8f18b8af8b2a26de4 (patch) | |
| tree | 40a5208a69d28e2a9a8cf7daa53909828c6ba743 /sys | |
| parent | 4d9781b3dbece651d7be988939f2c166bc7e8562 (diff) | |
| download | FreeBSD-src-06c7142d571dc7392f1409c8f18b8af8b2a26de4.zip FreeBSD-src-06c7142d571dc7392f1409c8f18b8af8b2a26de4.tar.gz | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/vnode.h | 1 | ||||
| -rw-r--r-- | 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 8b75ce7..2974f2f 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 5474589..7acf145 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)") |
