From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Wed, 8 Aug 2007 00:12:52 +0000 (+0000)
Subject: Adjust some comments with reality.
X-Git-Tag: v2.0.1~2446
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b478fdce94292a90c48527b648d8ba84de811623

Adjust some comments with reality.
---

diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index cde51559ad..9697438e03 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -37,7 +37,7 @@
  *
  *
  * $FreeBSD: src/sys/kern/vfs_default.c,v 1.28.2.7 2003/01/10 18:23:26 bde Exp $
- * $DragonFly: src/sys/kern/vfs_default.c,v 1.48 2007/07/13 01:20:10 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_default.c,v 1.49 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -1171,8 +1171,7 @@ vop_stdpathconf(struct vop_pathconf_args *ap)
 /*
  * Standard open.
  *
- * (struct vnode *a_vp, int a_mode, struct ucred *a_ucred, struct file *a_fp,
- *  struct thread *a_td)
+ * (struct vnode *a_vp, int a_mode, struct ucred *a_ucred, struct file *a_fp)
  *
  * a_mode: note, 'F' modes, e.g. FREAD, FWRITE
  */
@@ -1206,7 +1205,7 @@ vop_stdopen(struct vop_open_args *ap)
 /*
  * Standard close.
  *
- * (struct vnode *a_vp, int a_fflag, struct thread *a_td)
+ * (struct vnode *a_vp, int a_fflag)
  *
  * a_fflag: note, 'F' modes, e.g. FREAD, FWRITE.  same as a_mode in stdopen?
  */
diff --git a/sys/kern/vfs_jops.c b/sys/kern/vfs_jops.c
index b9f5a7433f..f8eb149cca 100644
--- a/sys/kern/vfs_jops.c
+++ b/sys/kern/vfs_jops.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/sys/kern/vfs_jops.c,v 1.34 2007/05/09 00:53:34 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_jops.c,v 1.35 2007/08/08 00:12:51 swildner Exp $
  */
 /*
  * Each mount point may have zero or more independantly configured journals
@@ -794,7 +794,7 @@ done:
  */
 
 /*
- * Journal vop_settattr { a_vp, a_vap, a_cred, a_td }
+ * Journal vop_setattr { a_vp, a_vap, a_cred }
  */
 static
 int
@@ -906,7 +906,7 @@ journal_write(struct vop_write_args *ap)
 }
 
 /*
- * Journal vop_fsync { a_vp, a_waitfor, a_td }
+ * Journal vop_fsync { a_vp, a_waitfor }
  */
 static
 int
@@ -969,7 +969,7 @@ journal_putpages(struct vop_putpages_args *ap)
 }
 
 /*
- * Journal vop_setacl { a_vp, a_type, a_aclp, a_cred, a_td }
+ * Journal vop_setacl { a_vp, a_type, a_aclp, a_cred }
  */
 static
 int
@@ -1004,7 +1004,7 @@ journal_setacl(struct vop_setacl_args *ap)
 }
 
 /*
- * Journal vop_setextattr { a_vp, a_name, a_uio, a_cred, a_td }
+ * Journal vop_setextattr { a_vp, a_name, a_uio, a_cred }
  */
 static
 int
diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c
index e07ca8e56e..16085f2876 100644
--- a/sys/kern/vfs_sync.c
+++ b/sys/kern/vfs_sync.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
  * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.249.2.30 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/kern/vfs_sync.c,v 1.15 2007/05/06 19:23:31 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_sync.c,v 1.16 2007/08/08 00:12:51 swildner Exp $
  */
 
 /*
@@ -368,8 +368,7 @@ sync_close(struct vop_close_args *ap)
 /*
  * Do a lazy sync of the filesystem.
  *
- * sync_fsync { struct vnode *a_vp, struct ucred *a_cred, int a_waitfor,
- *		struct thread *a_td }
+ * sync_fsync { struct vnode *a_vp, int a_waitfor }
  */
 static int
 sync_fsync(struct vop_fsync_args *ap)
diff --git a/sys/vfs/fdesc/fdesc_vnops.c b/sys/vfs/fdesc/fdesc_vnops.c
index 44dceb1fa6..6e50d9424d 100644
--- a/sys/vfs/fdesc/fdesc_vnops.c
+++ b/sys/vfs/fdesc/fdesc_vnops.c
@@ -36,7 +36,7 @@
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
  * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.47.2.1 2001/10/22 22:49:26 chris Exp $
- * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.37 2007/05/09 00:53:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.38 2007/08/08 00:12:51 swildner Exp $
  */
 
 /*
@@ -238,7 +238,8 @@ bad:
 }
 
 /*
- * fdesc_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
+ * fdesc_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	      struct file *a_fp)
  */
 static int
 fdesc_open(struct vop_open_args *ap)
@@ -365,7 +366,7 @@ fdesc_getattr(struct vop_getattr_args *ap)
 
 /*
  * fdesc_setattr(struct vnode *a_vp, struct vattr *a_vap,
- *		 struct ucred *a_cred, struct thread *a_td)
+ *		 struct ucred *a_cred)
  */
 static int
 fdesc_setattr(struct vop_setattr_args *ap)
@@ -485,8 +486,7 @@ done:
 }
 
 /*
- * fdesc_poll(struct vnode *a_vp, int a_events, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * fdesc_poll(struct vnode *a_vp, int a_events, struct ucred *a_cred)
  */
 static int
 fdesc_poll(struct vop_poll_args *ap)
@@ -495,7 +495,7 @@ fdesc_poll(struct vop_poll_args *ap)
 }
 
 /*
- * fdesc_inactive(struct vnode *a_vp, struct thread *a_td)
+ * fdesc_inactive(struct vnode *a_vp)
  */
 static int
 fdesc_inactive(struct vop_inactive_args *ap)
diff --git a/sys/vfs/fifofs/fifo_vnops.c b/sys/vfs/fifofs/fifo_vnops.c
index 827749713a..7917729a4c 100644
--- a/sys/vfs/fifofs/fifo_vnops.c
+++ b/sys/vfs/fifofs/fifo_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.45.2.4 2003/04/22 10:11:24 bde Exp $
- * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.38 2007/05/06 19:23:33 dillon Exp $
+ * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.39 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -156,7 +156,7 @@ fifo_lookup(struct vop_old_lookup_args *ap)
  * to find an active instance of a fifo.
  *
  * fifo_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	     struct thread *a_td)
+ *	     struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -328,7 +328,7 @@ fifo_write(struct vop_write_args *ap)
  * Device ioctl operation.
  *
  * fifo_ioctl(struct vnode *a_vp, int a_command, caddr_t a_data, int a_fflag,
- *	      struct ucred *a_cred, struct thread *a_td)
+ *	      struct ucred *a_cred)
  */
 /* ARGSUSED */
 static int
@@ -430,8 +430,7 @@ filt_fifowrite(struct knote *kn, long hint)
 }
 
 /*
- * fifo_poll(struct vnode *a_vp, int a_events, struct ucred *a_cred,
- *	     struct thread *a_td)
+ * fifo_poll(struct vnode *a_vp, int a_events, struct ucred *a_cred)
  */
 /* ARGSUSED */
 static int
@@ -477,7 +476,7 @@ fifo_poll(struct vop_poll_args *ap)
 }
 
 /*
- * fifo_inactive(struct vnode *a_vp, struct thread *a_td)
+ * fifo_inactive(struct vnode *a_vp)
  */
 static int
 fifo_inactive(struct vop_inactive_args *ap)
@@ -508,8 +507,7 @@ fifo_bmap(struct vop_bmap_args *ap)
 /*
  * Device close routine
  *
- * fifo_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * fifo_close(struct vnode *a_vp, int a_fflag)
  */
 /* ARGSUSED */
 static int
diff --git a/sys/vfs/gnu/ext2fs/ext2_vnops.c b/sys/vfs/gnu/ext2fs/ext2_vnops.c
index 857b5df0bc..4111c49a66 100644
--- a/sys/vfs/gnu/ext2fs/ext2_vnops.c
+++ b/sys/vfs/gnu/ext2fs/ext2_vnops.c
@@ -44,7 +44,7 @@
  *	@(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.51.2.2 2003/01/02 17:26:18 bde Exp $
- * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.39 2007/05/09 00:53:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.40 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include "opt_quota.h"
@@ -1303,7 +1303,8 @@ ext2_itimes(struct vnode *vp)
  *
  * Nothing to do.
  *
- * ext2_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
+ * ext2_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	     struct file *a_fp)
  */
 /* ARGSUSED */
 static
diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c
index 316ad6f130..9fcbfc6a16 100644
--- a/sys/vfs/hpfs/hpfs_vnops.c
+++ b/sys/vfs/hpfs/hpfs_vnops.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.41 2007/05/09 00:53:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.42 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -110,8 +110,7 @@ hpfs_putpages(struct vop_putpages_args *ap)
 }
 
 /*
- * hpfs_fsync(struct vnode *a_vp, struct ucred *a_cred, int a_waitfor,
- *	      struct proc *a_td)
+ * hpfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 static int
 hpfs_fsync(struct vop_fsync_args *ap)
@@ -142,7 +141,7 @@ loop:
 
 /*
  * hpfs_ioctl(struct vnode *a_vp, u_long a_command, caddr_t a_data,
- *	      int a_fflag, struct ucred *a_cred, struct proc *a_td)
+ *	      int a_fflag, struct ucred *a_cred)
  */
 static int
 hpfs_ioctl(struct vop_ioctl_args *ap)
@@ -437,8 +436,7 @@ hpfs_write(struct vop_write_args *ap)
 /*
  * XXXXX do we need hpfsnode locking inside?
  *
- * hpfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		struct proc *a_td)
+ * hpfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 hpfs_getattr(struct vop_getattr_args *ap)
@@ -487,8 +485,7 @@ hpfs_getattr(struct vop_getattr_args *ap)
 /*
  * XXXXX do we need hpfsnode locking inside?
  *
- * hpfs_setattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		struct thread *a_td)
+ * hpfs_setattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred)
  */
 static int
 hpfs_setattr(struct vop_setattr_args *ap)
@@ -722,8 +719,7 @@ hpfs_strategy(struct vop_strategy_args *ap)
 /*
  * XXXXX do we need hpfsnode locking inside?
  *
- * hpfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	       struct proc *a_td)
+ * hpfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 int
 hpfs_access(struct vop_access_args *ap)
diff --git a/sys/vfs/isofs/cd9660/cd9660_vnops.c b/sys/vfs/isofs/cd9660/cd9660_vnops.c
index f5ec0ee1a2..ad39699c1c 100644
--- a/sys/vfs/isofs/cd9660/cd9660_vnops.c
+++ b/sys/vfs/isofs/cd9660/cd9660_vnops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.62 1999/12/15 23:01:51 eivind Exp $
- * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.34 2007/05/09 00:53:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.35 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -195,7 +195,7 @@ cd9660_access(struct vop_access_args *ap)
 }
 
 /*
- * cd9660_getattr(struct vnode *a_vp, struct vattr *a_vap, struct thread *a_td)
+ * cd9660_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 cd9660_getattr(struct vop_getattr_args *ap)
diff --git a/sys/vfs/mfs/mfs_vnops.c b/sys/vfs/mfs/mfs_vnops.c
index 564fc39194..6e73030943 100644
--- a/sys/vfs/mfs/mfs_vnops.c
+++ b/sys/vfs/mfs/mfs_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.47.2.1 2001/05/22 02:06:43 bp Exp $
- * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.35 2007/05/09 00:53:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.36 2007/08/08 00:12:51 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -104,7 +104,7 @@ VNODEOP_SET(mfs_vnode_vops);
  * disassociate it in close rather then faking it when we created the vnode.
  *
  * mfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	    struct thread *a_td)
+ *	    struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -312,8 +312,7 @@ mfs_bmap(struct vop_bmap_args *ap)
 /*
  * Memory filesystem close routine
  *
- * mfs_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *	     struct thread *a_td)
+ * mfs_close(struct vnode *a_vp, int a_fflag)
  */
 /* ARGSUSED */
 static int
@@ -379,7 +378,7 @@ done:
 /*
  * Memory filesystem inactive routine
  *
- * mfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * mfs_inactive(struct vnode *a_vp)
  */
 /* ARGSUSED */
 static int
diff --git a/sys/vfs/msdosfs/msdosfs_denode.c b/sys/vfs/msdosfs/msdosfs_denode.c
index 9883f315b5..cc5ab63433 100644
--- a/sys/vfs/msdosfs/msdosfs_denode.c
+++ b/sys/vfs/msdosfs/msdosfs_denode.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_denode.c,v 1.47.2.3 2002/08/22 16:20:15 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.33 2007/08/07 20:05:30 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.34 2007/08/08 00:12:51 swildner Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
@@ -687,7 +687,7 @@ msdosfs_reclaim(struct vop_reclaim_args *ap)
 }
 
 /*
- * msdosfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * msdosfs_inactive(struct vnode *a_vp)
  */
 int
 msdosfs_inactive(struct vop_inactive_args *ap)
diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c
index 5ecd547543..68139413dc 100644
--- a/sys/vfs/msdosfs/msdosfs_vnops.c
+++ b/sys/vfs/msdosfs/msdosfs_vnops.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.47 2007/05/09 00:53:35 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.48 2007/08/08 00:12:51 swildner Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -211,7 +211,8 @@ msdosfs_mknod(struct vop_old_mknod_args *ap)
 }
 
 /*
- * msdosfs_open(struct vnode *a_vp)
+ * msdosfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *		struct file *a_fp)
  */
 static int
 msdosfs_open(struct vop_open_args *ap)
@@ -220,8 +221,7 @@ msdosfs_open(struct vop_open_args *ap)
 }
 
 /*
- * msdosfs_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * msdosfs_close(struct vnode *a_vp, int a_fflag)
  */
 static int
 msdosfs_close(struct vop_close_args *ap)
@@ -238,8 +238,7 @@ msdosfs_close(struct vop_close_args *ap)
 }
 
 /*
- * msdosfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		  struct thread *a_td)
+ * msdosfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 msdosfs_access(struct vop_access_args *ap)
@@ -314,8 +313,7 @@ msdosfs_access(struct vop_access_args *ap)
 }
 
 /*
- * msdosfs_getattr(struct vnode *a_vp, struct vattr *a_vap,
- *		   struct ucred *a_cred, struct thread *a_td)
+ * msdosfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 msdosfs_getattr(struct vop_getattr_args *ap)
@@ -380,7 +378,7 @@ msdosfs_getattr(struct vop_getattr_args *ap)
 
 /*
  * msdosfs_setattr(struct vnode *a_vp, struct vattr *a_vap,
- *		   struct ucred *a_cred, struct thread *a_td)
+ *		   struct ucred *a_cred)
  */
 static int
 msdosfs_setattr(struct vop_setattr_args *ap)
@@ -855,8 +853,7 @@ errexit:
  * This function is worthless for vnodes that represent directories. Maybe we
  * could just do a sync if they try an fsync on a directory file.
  *
- * msdosfs_fsync(struct vnode *a_vp, struct ucred *a_cred, int a_waitfor,
- *		 struct thread *a_td)
+ * msdosfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 static int
 msdosfs_fsync(struct vop_fsync_args *ap)
diff --git a/sys/vfs/nfs/nfs_node.c b/sys/vfs/nfs/nfs_node.c
index 810640f250..63f676ded7 100644
--- a/sys/vfs/nfs/nfs_node.c
+++ b/sys/vfs/nfs/nfs_node.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/nfs/nfs_node.c,v 1.36.2.3 2002/01/05 22:25:04 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.26 2007/05/06 19:23:34 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.27 2007/08/08 00:12:51 swildner Exp $
  */
 
 
@@ -199,7 +199,7 @@ loop:
 }
 
 /*
- * nfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * nfs_inactive(struct vnode *a_vp)
  *
  * NOTE: the passed vnode is locked but not referenced.  On return the
  * vnode must be unlocked and not referenced.
diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c
index 90a9acc3ce..bd319fce99 100644
--- a/sys/vfs/nfs/nfs_vnops.c
+++ b/sys/vfs/nfs/nfs_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.72 2007/06/15 17:25:05 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.73 2007/08/08 00:12:51 swildner Exp $
  */
 
 
@@ -292,8 +292,7 @@ nfsmout:
  * For nfs version 3, use the access rpc to check accessibility. If file modes
  * are changed on the server, accesses might still fail later.
  *
- * nfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * nfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 nfs_access(struct vop_access_args *ap)
@@ -447,7 +446,8 @@ nfs_access(struct vop_access_args *ap)
  * For paged in text files, you will need to flush the page cache
  * if consistency is lost.
  *
- * nfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
+ * nfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	    struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -544,8 +544,7 @@ nfs_open(struct vop_open_args *ap)
  *                     1 should be dealt with via an fsync() system call for
  *                     cases where write errors are important.
  *
- * nfs_close(struct vnode *a_vp, int a_fflag,
- *	     struct ucred *a_cred, struct thread *a_td)
+ * nfs_close(struct vnode *a_vp, int a_fflag)
  */
 /* ARGSUSED */
 static int
@@ -592,8 +591,7 @@ nfs_close(struct vop_close_args *ap)
 /*
  * nfs getattr call from vfs.
  *
- * nfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		struct thread *a_td)
+ * nfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 nfs_getattr(struct vop_getattr_args *ap)
@@ -2868,8 +2866,7 @@ nfs_strategy(struct vop_strategy_args *ap)
  *
  * NB Currently unsupported.
  *
- * nfs_mmap(struct vnode *a_vp, int a_fflags, struct ucred *a_cred,
- *	    struct thread *a_td)
+ * nfs_mmap(struct vnode *a_vp, int a_fflags, struct ucred *a_cred)
  */
 /* ARGSUSED */
 static int
@@ -2881,8 +2878,7 @@ nfs_mmap(struct vop_mmap_args *ap)
 /*
  * fsync vnode op. Just call nfs_flush() with commit == 1.
  *
- * nfs_fsync(struct vnode *a_vp, struct ucred * a_cred, int a_waitfor,
- *	     struct thread *a_td)
+ * nfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 /* ARGSUSED */
 static int
@@ -3233,8 +3229,7 @@ nfs_print(struct vop_print_args *ap)
  * Essentially just get vattr and then imitate iaccess() since the device is
  * local to the client.
  *
- * nfsspec_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		  struct thread *a_td)
+ * nfsspec_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 nfsspec_access(struct vop_access_args *ap)
@@ -3335,8 +3330,7 @@ nfsspec_write(struct vop_write_args *ap)
  *
  * Update the times on the nfsnode then do device close.
  *
- * nfsspec_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * nfsspec_close(struct vnode *a_vp, int a_fflag)
  */
 static int
 nfsspec_close(struct vop_close_args *ap)
@@ -3403,7 +3397,7 @@ nfsfifo_write(struct vop_write_args *ap)
  *
  * Update the times on the nfsnode then do fifo close.
  *
- * nfsfifo_close(struct vnode *a_vp, int a_fflag, struct thread *a_td)
+ * nfsfifo_close(struct vnode *a_vp, int a_fflag)
  */
 static int
 nfsfifo_close(struct vop_close_args *ap)
diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c
index 7596f46999..10f63f708c 100644
--- a/sys/vfs/ntfs/ntfs_vnops.c
+++ b/sys/vfs/ntfs/ntfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.9.2.4 2002/08/06 19:35:18 semenu Exp $
- * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.40 2007/05/09 00:53:36 dillon Exp $
+ * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.41 2007/08/08 00:12:52 swildner Exp $
  *
  */
 
@@ -215,8 +215,7 @@ ntfs_bypass(struct vop_generic_args *ap)
 #endif
 
 /*
- * ntfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		struct thread *a_td)
+ * ntfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 ntfs_getattr(struct vop_getattr_args *ap)
@@ -436,8 +435,7 @@ ntfs_write(struct vop_write_args *ap)
 }
 
 /*
- * ntfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		struct thread *a_td)
+ * ntfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 int
 ntfs_access(struct vop_access_args *ap)
@@ -519,7 +517,7 @@ ntfs_access(struct vop_access_args *ap)
  * Nothing to do.
  *
  * ntfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	     struct thread *a_td)
+ *	     struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -533,8 +531,7 @@ ntfs_open(struct vop_open_args *ap)
  *
  * Update the times on the inode.
  *
- * ntfs_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * ntfs_close(struct vnode *a_vp, int a_fflag)
  */
 /* ARGSUSED */
 static int
@@ -788,8 +785,7 @@ ntfs_lookup(struct vop_old_lookup_args *ap)
  * This function is worthless for vnodes that represent directories. Maybe we
  * could just do a sync if they try an fsync on a directory file.
  *
- * ntfs_fsync(struct vnode *a_vp, struct ucred *a_cred, int a_waitfor,
- *	      struct thread *a_td)
+ * ntfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 static int
 ntfs_fsync(struct vop_fsync_args *ap)
diff --git a/sys/vfs/nwfs/nwfs_ioctl.c b/sys/vfs/nwfs/nwfs_ioctl.c
index 21abd6530d..c739967a27 100644
--- a/sys/vfs/nwfs/nwfs_ioctl.c
+++ b/sys/vfs/nwfs/nwfs_ioctl.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_ioctl.c,v 1.2.2.1 2001/02/22 09:14:12 bp Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.7 2006/05/06 02:43:14 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.8 2007/08/08 00:12:52 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,7 @@
 
 /*
  * nwfs_ioctl(struct vnode *a_vp, u_long a_command, caddr_t a_data,
- *	      int a_fflag, struct ucred *a_cred, struct thread *a_td)
+ *	      int a_fflag, struct ucred *a_cred)
  */
 int
 nwfs_ioctl(struct vop_ioctl_args *ap)
diff --git a/sys/vfs/nwfs/nwfs_node.c b/sys/vfs/nwfs/nwfs_node.c
index 1c1d8dded4..f29ff34219 100644
--- a/sys/vfs/nwfs/nwfs_node.c
+++ b/sys/vfs/nwfs/nwfs_node.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_node.c,v 1.3.2.8 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.26 2007/05/09 00:53:36 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.27 2007/08/08 00:12:52 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -212,7 +212,7 @@ nwfs_lookupnp(struct nwmount *nmp, ncpfid fid, struct thread *td,
 /*
  * Free nwnode, and give vnode back to system
  *
- * nwfs_reclaim(struct vnode *a_vp, struct thread *a_td)
+ * nwfs_reclaim(struct vnode *a_vp)
  */
 int
 nwfs_reclaim(struct vop_reclaim_args *ap)
@@ -247,7 +247,7 @@ nwfs_reclaim(struct vop_reclaim_args *ap)
 }
 
 /*
- * nwfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * nwfs_inactive(struct vnode *a_vp)
  */
 int
 nwfs_inactive(struct vop_inactive_args *ap)
diff --git a/sys/vfs/nwfs/nwfs_vnops.c b/sys/vfs/nwfs/nwfs_vnops.c
index 7eeb254ed7..747a3438b9 100644
--- a/sys/vfs/nwfs/nwfs_vnops.c
+++ b/sys/vfs/nwfs/nwfs_vnops.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_vnops.c,v 1.6.2.3 2001/03/14 11:26:59 bp Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.35 2007/05/06 19:23:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.36 2007/08/08 00:12:52 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,8 +119,7 @@ struct vop_ops nwfs_vnode_vops = {
  * nwfs_access vnode op
  * for now just return ok
  *
- * nwfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		struct thread *a_td)
+ * nwfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 nwfs_access(struct vop_access_args *ap)
@@ -153,7 +152,8 @@ nwfs_access(struct vop_access_args *ap)
 /*
  * nwfs_open vnode op
  *
- * nwfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
+ * nwfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	     struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -219,8 +219,7 @@ nwfs_open(struct vop_open_args *ap)
 }
 
 /*
- * nwfs_close(struct vnode *a_vp, int a_fflag,
- *	      struct ucred *a_cred, struct thread *a_td)
+ * nwfs_close(struct vnode *a_vp, int a_fflag)
  */
 static int
 nwfs_close(struct vop_close_args *ap)
@@ -255,8 +254,7 @@ done:
 /*
  * nwfs_getattr call from vfs.
  *
- * nwfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		struct thread *a_td)
+ * nwfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 nwfs_getattr(struct vop_getattr_args *ap)
@@ -685,14 +683,13 @@ nwfs_readdir(struct vop_readdir_args *ap)
 }
 
 /*
- * nwfs_fsync(struct vnode *a_vp, struct ucred *a_cred,
- *	      int a_waitfor, struct thread *a_td)
+ * nwfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 /* ARGSUSED */
 static int
 nwfs_fsync(struct vop_fsync_args *ap)
 {
-/*	return (nfs_flush(ap->a_vp, ap->a_cred, ap->a_waitfor, ap->a_td, 1));*/
+/*	return (nfs_flush(ap->a_vp, ap->a_waitfor, curthread, 1));*/
     return (0);
 }
 
diff --git a/sys/vfs/portal/portal_vnops.c b/sys/vfs/portal/portal_vnops.c
index 37f31f2d71..c48307da65 100644
--- a/sys/vfs/portal/portal_vnops.c
+++ b/sys/vfs/portal/portal_vnops.c
@@ -36,7 +36,7 @@
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.38 1999/12/21 06:29:00 chris Exp $
- * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.37 2007/05/18 17:05:13 dillon Exp $
+ * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.38 2007/08/08 00:12:52 swildner Exp $
  */
 
 /*
@@ -200,7 +200,7 @@ portal_connect(struct socket *so, struct socket *so2)
 
 /*
  * portal_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		struct thread *a_td)
+ *	       struct file *a_fp)
  */
 static int
 portal_open(struct vop_open_args *ap)
@@ -435,8 +435,7 @@ bad:;
 }
 
 /*
- * portal_getattr(struct vnode *a_vp, struct vattr *a_vap,
- *		  struct ucred *a_cred, struct thread *a_td)
+ * portal_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 portal_getattr(struct vop_getattr_args *ap)
@@ -480,7 +479,7 @@ portal_getattr(struct vop_getattr_args *ap)
 
 /*
  * portal_setattr(struct vnode *a_vp, struct vattr *a_vap,
- *		  struct ucred *a_cred, struct thread *a_td)
+ *		  struct ucred *a_cred)
  */
 static int
 portal_setattr(struct vop_setattr_args *ap)
@@ -519,7 +518,7 @@ portal_readdir(struct vop_readdir_args *ap)
 }
 
 /*
- * portal_inactive(struct vnode *a_vp, struct thread *a_td)
+ * portal_inactive(struct vnode *a_vp)
  */
 static int
 portal_inactive(struct vop_inactive_args *ap)
diff --git a/sys/vfs/procfs/procfs_vnops.c b/sys/vfs/procfs/procfs_vnops.c
index 3f73895531..cd47611b35 100644
--- a/sys/vfs/procfs/procfs_vnops.c
+++ b/sys/vfs/procfs/procfs_vnops.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $
- * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.43 2007/05/06 19:23:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.44 2007/08/08 00:12:52 swildner Exp $
  */
 
 /*
@@ -162,7 +162,8 @@ static pid_t atopid (const char *, u_int);
  * is to support exclusive open on process
  * memory images.
  *
- * procfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
+ * procfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	       struct file *a_fp)
  */
 static int
 procfs_open(struct vop_open_args *ap)
@@ -374,7 +375,7 @@ procfs_bmap(struct vop_bmap_args *ap)
  *
  * (vp) is locked on entry, but must be unlocked on exit.
  *
- * procfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * procfs_inactive(struct vnode *a_vp)
  */
 static int
 procfs_inactive(struct vop_inactive_args *ap)
@@ -434,8 +435,7 @@ procfs_badop(struct vop_generic_args *ap)
  *
  * this is relatively minimal for procfs.
  *
- * procfs_getattr(struct vnode *a_vp, struct vattr *a_vap,
- *		  struct ucred *a_cred,	struct thread *a_td)
+ * procfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 procfs_getattr(struct vop_getattr_args *ap)
@@ -604,7 +604,7 @@ procfs_getattr(struct vop_getattr_args *ap)
 
 /*
  * procfs_setattr(struct vnode *a_vp, struct vattr *a_vap,
- *		  struct ucred *a_cred,	struct thread *a_td)
+ *		  struct ucred *a_cred)
  */
 static int
 procfs_setattr(struct vop_setattr_args *ap)
@@ -637,8 +637,7 @@ procfs_setattr(struct vop_setattr_args *ap)
  * but does mean that the i/o entry points need to check
  * that the operation really does make sense.
  *
- * procfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * procfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 procfs_access(struct vop_access_args *ap)
diff --git a/sys/vfs/smbfs/smbfs_node.c b/sys/vfs/smbfs/smbfs_node.c
index 705fcd1a71..bce0500312 100644
--- a/sys/vfs/smbfs/smbfs_node.c
+++ b/sys/vfs/smbfs/smbfs_node.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.2.2.3 2003/01/17 08:20:26 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.24 2007/05/09 00:53:36 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.25 2007/08/08 00:12:52 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -292,7 +292,7 @@ smbfs_nget(struct mount *mp, struct vnode *dvp, const char *name, int nmlen,
 /*
  * Free smbnode, and give vnode back to system
  *
- * smbfs_reclaim(struct vnode *a_vp, struct thread *a_td)
+ * smbfs_reclaim(struct vnode *a_vp)
  */
 int
 smbfs_reclaim(struct vop_reclaim_args *ap)
@@ -332,7 +332,7 @@ smbfs_reclaim(struct vop_reclaim_args *ap)
 }
 
 /*
- * smbfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ * smbfs_inactive(struct vnode *a_vp)
  */
 int
 smbfs_inactive(struct vop_inactive_args *ap)
diff --git a/sys/vfs/smbfs/smbfs_vnops.c b/sys/vfs/smbfs/smbfs_vnops.c
index 24e2488bd2..caeea82185 100644
--- a/sys/vfs/smbfs/smbfs_vnops.c
+++ b/sys/vfs/smbfs/smbfs_vnops.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.2.2.8 2003/04/04 08:57:23 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.38 2007/05/06 19:23:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.39 2007/08/08 00:12:52 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -121,8 +121,7 @@ struct vop_ops smbfs_vnode_vops = {
 };
 
 /*
- * smbfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *		struct thread *a_td)
+ * smbfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static int
 smbfs_access(struct vop_access_args *ap)
@@ -155,7 +154,7 @@ smbfs_access(struct vop_access_args *ap)
 
 /*
  * smbfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	      struct thread *a_td)
+ *	      struct file *a_fp)
  */
 /* ARGSUSED */
 static int
@@ -269,7 +268,7 @@ done:
 /*
  * smbfs_getattr call from vfs.
  *
- * smbfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct thread *a_td)
+ * smbfs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 static int
 smbfs_getattr(struct vop_getattr_args *ap)
@@ -302,8 +301,7 @@ smbfs_getattr(struct vop_getattr_args *ap)
 }
 
 /*
- * smbfs_setattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * smbfs_setattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred)
  */
 static int
 smbfs_setattr(struct vop_setattr_args *ap)
@@ -734,14 +732,13 @@ smbfs_readdir(struct vop_readdir_args *ap)
 }
 
 /*
- * smbfs_fsync(struct vnode *a_vp, struct ucred *a_cred,
- *	       int a_waitfor, struct thread *a_td)
+ * smbfs_fsync(struct vnode *a_vp, int a_waitfor)
  */
 /* ARGSUSED */
 static int
 smbfs_fsync(struct vop_fsync_args *ap)
 {
-/*	return (smb_flush(ap->a_vp, ap->a_cred, ap->a_waitfor, ap->a_td, 1));*/
+/*	return (smb_flush(ap->a_vp, ap->a_waitfor, curthread, 1));*/
     return (0);
 }
 
@@ -844,16 +841,13 @@ smbfs_ioctl(struct vop_ioctl_args *ap)
 }
 
 static char smbfs_atl[] = "rhsvda";
+
+/*
+ * smbfs_getextattr(struct vnode *a_vp, char *a_name, struct uio *a_uio,
+ *		struct ucred *a_cred)
+ */
 static int
 smbfs_getextattr(struct vop_getextattr_args *ap)
-/* {
-        IN struct vnode *a_vp;
-        IN char *a_name;
-        INOUT struct uio *a_uio;
-        IN struct ucred *a_cred;
-        IN struct thread *a_td;
-};
-*/
 {
 	struct vnode *vp = ap->a_vp;
 	struct ucred *cred = ap->a_cred;
diff --git a/sys/vfs/specfs/spec_vnops.c b/sys/vfs/specfs/spec_vnops.c
index 8dc6c8e157..ff16de5992 100644
--- a/sys/vfs/specfs/spec_vnops.c
+++ b/sys/vfs/specfs/spec_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
  * $FreeBSD: src/sys/miscfs/specfs/spec_vnops.c,v 1.131.2.4 2001/02/26 04:23:20 jlemon Exp $
- * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.53 2007/07/23 19:19:11 dillon Exp $
+ * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.54 2007/08/08 00:12:52 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -419,8 +419,7 @@ spec_kqfilter(struct vop_kqfilter_args *ap)
 /*
  * Synch buffers associated with a block device
  *
- * spec_fsync(struct vnode *a_vp, struct ucred *a_cred,
- *	      int a_waitfor, struct thread *a_td)
+ * spec_fsync(struct vnode *a_vp, int a_waitfor)
  */
 /* ARGSUSED */
 static int
@@ -440,7 +439,7 @@ spec_fsync(struct vop_fsync_args *ap)
 }
 
 /*
- * spec_inactive(struct vnode *a_vp, struct thread *a_td)
+ * spec_inactive(struct vnode *a_vp)
  */
 static int
 spec_inactive(struct vop_inactive_args *ap)
@@ -691,8 +690,7 @@ spec_bmap(struct vop_bmap_args *ap)
 /*
  * Device close routine
  *
- * spec_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * spec_close(struct vnode *a_vp, int a_fflag)
  *
  * NOTE: the vnode may or may not be locked on call.
  */
diff --git a/sys/vfs/ufs/ufs_vnops.c b/sys/vfs/ufs/ufs_vnops.c
index 02f854e1dc..4ba1801c95 100644
--- a/sys/vfs/ufs/ufs_vnops.c
+++ b/sys/vfs/ufs/ufs_vnops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.131.2.8 2003/01/02 17:26:19 bde Exp $
- * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.60 2007/05/09 00:53:36 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.61 2007/08/08 00:12:52 swildner Exp $
  */
 
 #include "opt_quota.h"
@@ -266,7 +266,7 @@ ufs_mknod(struct vop_old_mknod_args *ap)
  * Nothing to do.
  *
  * ufs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	    struct thread *a_td)
+ *	    struct file *a_fp)
  */
 /* ARGSUSED */
 static
@@ -291,8 +291,7 @@ ufs_open(struct vop_open_args *ap)
  *
  * Update the times on the inode.
  *
- * ufs_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *	     struct thread *a_td)
+ * ufs_close(struct vnode *a_vp, int a_fflag)
  */
 /* ARGSUSED */
 static
@@ -307,8 +306,7 @@ ufs_close(struct vop_close_args *ap)
 }
 
 /*
- * ufs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
- *	      struct thread *a_td)
+ * ufs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred)
  */
 static
 int
@@ -390,8 +388,7 @@ ufs_access(struct vop_access_args *ap)
 }
 
 /*
- * ufs_getattr(struct vnode *a_vp, struct vattr *a_vap,
- *		struct thread *a_td)
+ * ufs_getattr(struct vnode *a_vp, struct vattr *a_vap)
  */
 /* ARGSUSED */
 static
@@ -447,7 +444,7 @@ ufs_getattr(struct vop_getattr_args *ap)
  * Set attribute vnode op. called from several syscalls
  *
  * ufs_setattr(struct vnode *a_vp, struct vattr *a_vap,
- *		struct ucred *a_cred, struct thread *a_td)
+ *		struct ucred *a_cred)
  */
 static
 int
@@ -697,8 +694,7 @@ good:
  *
  * NB Currently unsupported.
  *
- * ufs_mmap(struct vnode *a_vp, int a_fflags, struct ucred *a_cred,
- *	    struct thread *a_td)
+ * ufs_mmap(struct vnode *a_vp, int a_fflags, struct ucred *a_cred)
  */
 /* ARGSUSED */
 static
@@ -1940,8 +1936,7 @@ ufsspec_write(struct vop_write_args *ap)
  *
  * Update the times on the inode then do device close.
  *
- * ufsspec_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * ufsspec_close(struct vnode *a_vp, int a_fflag)
  */
 static 
 int
@@ -2006,8 +2001,7 @@ ufsfifo_write(struct vop_write_args *ap)
  *
  * Update the times on the inode then do device close.
  *
- * ufsfifo_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
- *		 struct thread *a_td)
+ * ufsfifo_close(struct vnode *a_vp, int a_fflag)
  */
 static
 int