Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vnops.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.77.12.1
retrieving revision 1.77.12.2
diff -u -p -r1.77.12.1 -r1.77.12.2
--- src/sys/ufs/ffs/ffs_vnops.c	2006/03/31 09:45:29	1.77.12.1
+++ src/sys/ufs/ffs/ffs_vnops.c	2006/05/24 15:50:48	1.77.12.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vnops.c,v 1.77.12.1 2006/03/31 09:45:29 tron Exp $	*/
+/*	$NetBSD: ffs_vnops.c,v 1.77.12.2 2006/05/24 15:50:48 tron Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.77.12.1 2006/03/31 09:45:29 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.77.12.2 2006/05/24 15:50:48 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,
 #include <sys/vnode.h>
 #include <sys/pool.h>
 #include <sys/signalvar.h>
+#include <sys/kauth.h>
 
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
@@ -237,7 +238,7 @@ ffs_fsync(void *v)
 {
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		int a_flags;
 		off_t a_offlo;
 		off_t a_offhi;
@@ -322,7 +323,7 @@ ffs_fsync(void *v)
 	if (error == 0 && ap->a_flags & FSYNC_CACHE) {
 		int l = 0;
 		VOP_IOCTL(VTOI(vp)->i_devvp, DIOCCACHESYNC, &l, FWRITE,
-			ap->a_l->l_proc->p_ucred, ap->a_l);
+			ap->a_l->l_proc->p_cred, ap->a_l);
 	}
 
 	return error;
@@ -337,7 +338,7 @@ ffs_full_fsync(void *v)
 {
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		int a_flags;
 		off_t a_offlo;
 		off_t a_offhi;
@@ -461,7 +462,7 @@ loop:
 	if (error == 0 && ap->a_flags & FSYNC_CACHE) {
 		int i = 0;
 		VOP_IOCTL(VTOI(vp)->i_devvp, DIOCCACHESYNC, &i, FWRITE,
-			ap->a_l->l_proc->p_ucred, ap->a_l);
+			ap->a_l->l_proc->p_cred, ap->a_l);
 	}
 
 	return error;
@@ -546,11 +547,6 @@ ffs_gop_size(struct vnode *vp, off_t siz
 	struct fs *fs = ip->i_fs;
 	daddr_t olbn, nlbn;
 
-	if ((flags & GOP_SIZE_MEM) != 0) {
-		*eobp = MAX(size, vp->v_size);
-		return;
-	}
-
 	olbn = lblkno(fs, ip->i_size);
 	nlbn = lblkno(fs, size);
 	if (nlbn < NDADDR && olbn <= nlbn) {
@@ -565,7 +561,7 @@ ffs_openextattr(void *v)
 {
 	struct vop_openextattr_args /* {
 		struct vnode *a_vp;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);
@@ -585,7 +581,7 @@ ffs_closeextattr(void *v)
 	struct vop_closeextattr_args /* {
 		struct vnode *a_vp;
 		int a_commit;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);
@@ -608,7 +604,7 @@ ffs_getextattr(void *v)
 		const char *a_name;
 		struct uio *a_uio;
 		size_t *a_size;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);
@@ -634,7 +630,7 @@ ffs_setextattr(void *v)
 		int a_attrnamespace;
 		const char *a_name;
 		struct uio *a_uio;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);
@@ -660,7 +656,7 @@ ffs_listextattr(void *v)
 		int a_attrnamespace;
 		struct uio *a_uio;
 		size_t *a_size;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);
@@ -680,7 +676,7 @@ ffs_deleteextattr(void *v)
 	struct vop_deleteextattr_args /* {
 		struct vnode *a_vp;
 		int a_attrnamespace;
-		struct ucred *a_cred;
+		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct inode *ip = VTOI(ap->a_vp);