--- src/sys/kern/vfs_vopops.c	2006/07/18 22:22:12	1.28
+++ src/sys/kern/vfs_vopops.c	2006/07/19 06:08:06	1.29
@@ -79,73 +79,70 @@
 #define VARGSSTRUCT(name) struct __CONCAT(__CONCAT(vop_,name),_args)
 
 #define VNODEOP_DESC_INIT(name)						\
-	struct vnodeop_desc VDESCNAME(name) = {				\
+	struct syslink_desc VDESCNAME(name) = {				\
 		__offsetof(struct vop_ops, __CONCAT(vop_, name)),	\
 		#name }
 
-#define VNODEOP_DESC_INIT_SIMPLE(name)					\
-	VNODEOP_DESC_INIT(name)
-
-VNODEOP_DESC_INIT_SIMPLE(default);
-VNODEOP_DESC_INIT_SIMPLE(islocked);
-VNODEOP_DESC_INIT_SIMPLE(old_lookup);
-VNODEOP_DESC_INIT_SIMPLE(old_create);
-VNODEOP_DESC_INIT_SIMPLE(old_whiteout);
-VNODEOP_DESC_INIT_SIMPLE(old_mknod);
-VNODEOP_DESC_INIT_SIMPLE(open);
-VNODEOP_DESC_INIT_SIMPLE(close);
-VNODEOP_DESC_INIT_SIMPLE(access);
-VNODEOP_DESC_INIT_SIMPLE(getattr);
-VNODEOP_DESC_INIT_SIMPLE(setattr);
-VNODEOP_DESC_INIT_SIMPLE(read);
-VNODEOP_DESC_INIT_SIMPLE(write);
-VNODEOP_DESC_INIT_SIMPLE(ioctl);
-VNODEOP_DESC_INIT_SIMPLE(poll);
-VNODEOP_DESC_INIT_SIMPLE(kqfilter);
-VNODEOP_DESC_INIT_SIMPLE(revoke);
-VNODEOP_DESC_INIT_SIMPLE(mmap);
-VNODEOP_DESC_INIT_SIMPLE(fsync);
-VNODEOP_DESC_INIT_SIMPLE(old_remove);
-VNODEOP_DESC_INIT_SIMPLE(old_link);
-VNODEOP_DESC_INIT_SIMPLE(old_rename);
-
-VNODEOP_DESC_INIT_SIMPLE(old_mkdir);
-VNODEOP_DESC_INIT_SIMPLE(old_rmdir);
-VNODEOP_DESC_INIT_SIMPLE(old_symlink);
-VNODEOP_DESC_INIT_SIMPLE(readdir);
-VNODEOP_DESC_INIT_SIMPLE(readlink);
-VNODEOP_DESC_INIT_SIMPLE(inactive);
-VNODEOP_DESC_INIT_SIMPLE(reclaim);
-VNODEOP_DESC_INIT_SIMPLE(lock);
-VNODEOP_DESC_INIT_SIMPLE(unlock);
-VNODEOP_DESC_INIT_SIMPLE(bmap);
-VNODEOP_DESC_INIT_SIMPLE(strategy);
-VNODEOP_DESC_INIT_SIMPLE(print);
-VNODEOP_DESC_INIT_SIMPLE(pathconf);
-VNODEOP_DESC_INIT_SIMPLE(advlock);
-VNODEOP_DESC_INIT_SIMPLE(balloc);
-VNODEOP_DESC_INIT_SIMPLE(reallocblks);
-VNODEOP_DESC_INIT_SIMPLE(getpages);
-VNODEOP_DESC_INIT_SIMPLE(putpages);
-VNODEOP_DESC_INIT_SIMPLE(freeblks);
-VNODEOP_DESC_INIT_SIMPLE(getacl);
-VNODEOP_DESC_INIT_SIMPLE(setacl);
-VNODEOP_DESC_INIT_SIMPLE(aclcheck);
-VNODEOP_DESC_INIT_SIMPLE(getextattr);
-VNODEOP_DESC_INIT_SIMPLE(setextattr);
-VNODEOP_DESC_INIT_SIMPLE(mountctl);
-
-VNODEOP_DESC_INIT_SIMPLE(nresolve);
-VNODEOP_DESC_INIT_SIMPLE(nlookupdotdot);
-VNODEOP_DESC_INIT_SIMPLE(ncreate);
-VNODEOP_DESC_INIT_SIMPLE(nmkdir);
-VNODEOP_DESC_INIT_SIMPLE(nmknod);
-VNODEOP_DESC_INIT_SIMPLE(nlink);
-VNODEOP_DESC_INIT_SIMPLE(nsymlink);
-VNODEOP_DESC_INIT_SIMPLE(nwhiteout);
-VNODEOP_DESC_INIT_SIMPLE(nremove);
-VNODEOP_DESC_INIT_SIMPLE(nrmdir);
-VNODEOP_DESC_INIT_SIMPLE(nrename);
+VNODEOP_DESC_INIT(default);
+VNODEOP_DESC_INIT(islocked);
+VNODEOP_DESC_INIT(old_lookup);
+VNODEOP_DESC_INIT(old_create);
+VNODEOP_DESC_INIT(old_whiteout);
+VNODEOP_DESC_INIT(old_mknod);
+VNODEOP_DESC_INIT(open);
+VNODEOP_DESC_INIT(close);
+VNODEOP_DESC_INIT(access);
+VNODEOP_DESC_INIT(getattr);
+VNODEOP_DESC_INIT(setattr);
+VNODEOP_DESC_INIT(read);
+VNODEOP_DESC_INIT(write);
+VNODEOP_DESC_INIT(ioctl);
+VNODEOP_DESC_INIT(poll);
+VNODEOP_DESC_INIT(kqfilter);
+VNODEOP_DESC_INIT(revoke);
+VNODEOP_DESC_INIT(mmap);
+VNODEOP_DESC_INIT(fsync);
+VNODEOP_DESC_INIT(old_remove);
+VNODEOP_DESC_INIT(old_link);
+VNODEOP_DESC_INIT(old_rename);
+
+VNODEOP_DESC_INIT(old_mkdir);
+VNODEOP_DESC_INIT(old_rmdir);
+VNODEOP_DESC_INIT(old_symlink);
+VNODEOP_DESC_INIT(readdir);
+VNODEOP_DESC_INIT(readlink);
+VNODEOP_DESC_INIT(inactive);
+VNODEOP_DESC_INIT(reclaim);
+VNODEOP_DESC_INIT(lock);
+VNODEOP_DESC_INIT(unlock);
+VNODEOP_DESC_INIT(bmap);
+VNODEOP_DESC_INIT(strategy);
+VNODEOP_DESC_INIT(print);
+VNODEOP_DESC_INIT(pathconf);
+VNODEOP_DESC_INIT(advlock);
+VNODEOP_DESC_INIT(balloc);
+VNODEOP_DESC_INIT(reallocblks);
+VNODEOP_DESC_INIT(getpages);
+VNODEOP_DESC_INIT(putpages);
+VNODEOP_DESC_INIT(freeblks);
+VNODEOP_DESC_INIT(getacl);
+VNODEOP_DESC_INIT(setacl);
+VNODEOP_DESC_INIT(aclcheck);
+VNODEOP_DESC_INIT(getextattr);
+VNODEOP_DESC_INIT(setextattr);
+VNODEOP_DESC_INIT(mountctl);
+
+VNODEOP_DESC_INIT(nresolve);
+VNODEOP_DESC_INIT(nlookupdotdot);
+VNODEOP_DESC_INIT(ncreate);
+VNODEOP_DESC_INIT(nmkdir);
+VNODEOP_DESC_INIT(nmknod);
+VNODEOP_DESC_INIT(nlink);
+VNODEOP_DESC_INIT(nsymlink);
+VNODEOP_DESC_INIT(nwhiteout);
+VNODEOP_DESC_INIT(nremove);
+VNODEOP_DESC_INIT(nrmdir);
+VNODEOP_DESC_INIT(nrename);
 
 #define DO_OPS(ops, error, ap, vop_field)	\
 	error = ops->vop_field(ap);