7 files changed, 12 insertions, 18 deletions

diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index a222e7d..5982367 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -395,14 +395,13 @@ venus_readlink(void *mdp, CodaFid *fid,
 }
 
 int
-venus_fsync(void *mdp, CodaFid *fid,
-	struct ucred *cred, struct proc *p)
+venus_fsync(void *mdp, CodaFid *fid, struct proc *p)
 {
     DECL_NO_OUT(coda_fsync);		/* sets Isize & Osize */
     ALLOC_NO_OUT(coda_fsync);		/* sets inp & outp */
 
     /* send the open to venus. */
-    INIT_IN(&inp->ih, CODA_FSYNC, cred, p);
+    INIT_IN(&inp->ih, CODA_FSYNC, NOCRED, p);	/* XXX: should be cached mount cred */
     inp->Fid = *fid;
 
     error = coda_call(mdp, Isize, &Osize, (char *)inp);
diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h
index 533ddcb..1d1e0cf 100644
--- a/sys/fs/coda/coda_venus.h
+++ b/sys/fs/coda/coda_venus.h
@@ -75,8 +75,7 @@ venus_readlink(void *mdp, CodaFid *fid,
 /*out*/	char **str, int *len);
 
 int
-venus_fsync(void *mdp, CodaFid *fid,
-	struct ucred *cred, struct proc *p);
+venus_fsync(void *mdp, CodaFid *fid, struct proc *p);
 
 int
 venus_lookup(void *mdp, CodaFid *fid,
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index 103946b..5e7c250 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -419,10 +419,9 @@ coda_nb_statfs(vfsp, sbp, td)
  * Flush any pending I/O.
  */
 int
-coda_sync(vfsp, waitfor, cred, td)
+coda_sync(vfsp, waitfor, td)
     struct mount *vfsp;
     int    waitfor;
-    struct ucred *cred;
     struct thread *td;
 {
     ENTRY;
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index c204ef6..71b6976 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -763,7 +763,6 @@ coda_fsync(struct vop_fsync_args *ap)
 /* true args */
     struct vnode *vp = ap->a_vp;
     struct cnode *cp = VTOC(vp);
-    struct ucred *cred = ap->a_cred;
     struct thread *td = ap->a_td;
 /* locals */
     struct vnode *convp = cp->c_ovp;
@@ -787,7 +786,7 @@ coda_fsync(struct vop_fsync_args *ap)
     }
 
     if (convp)
-    	VOP_FSYNC(convp, cred, MNT_WAIT, td);
+    	VOP_FSYNC(convp, MNT_WAIT, td);
 
     /*
      * We see fsyncs with usecount == 1 then usecount == 0.
@@ -815,7 +814,7 @@ coda_fsync(struct vop_fsync_args *ap)
 
     /* needs research */
     return 0;
-    error = venus_fsync(vtomi(vp), &cp->c_fid, cred, td->td_proc);
+    error = venus_fsync(vtomi(vp), &cp->c_fid, td->td_proc);
 
     CODADEBUG(CODA_FSYNC, myprintf(("in fsync result %d\n",error)); );
     return(error);
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index a79f08f..91dfb5c 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -270,7 +270,7 @@ msdosfs_mount(struct mount *mp, struct thread *td)
 		}
 		if (!(pmp->pm_flags & MSDOSFSMNT_RONLY) &&
 		    vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0)) {
-			error = VFS_SYNC(mp, MNT_WAIT, td->td_ucred, td);
+			error = VFS_SYNC(mp, MNT_WAIT, td);
 			if (error)
 				return (error);
 			flags = WRITECLOSE;
@@ -852,10 +852,9 @@ msdosfs_statfs(mp, sbp, td)
 }
 
 static int
-msdosfs_sync(mp, waitfor, cred, td)
+msdosfs_sync(mp, waitfor, td)
 	struct mount *mp;
 	int waitfor;
-	struct ucred *cred;
 	struct thread *td;
 {
 	struct vnode *vp, *nvp;
@@ -902,7 +901,7 @@ loop:
 				goto loop;
 			continue;
 		}
-		error = VOP_FSYNC(vp, cred, waitfor, td);
+		error = VOP_FSYNC(vp, waitfor, td);
 		if (error)
 			allerror = error;
 		VOP_UNLOCK(vp, 0, td);
@@ -916,7 +915,7 @@ loop:
 	 */
 	if (waitfor != MNT_LAZY) {
 		vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY, td);
-		error = VOP_FSYNC(pmp->pm_devvp, cred, waitfor, td);
+		error = VOP_FSYNC(pmp->pm_devvp, waitfor, td);
 		if (error)
 			allerror = error;
 		VOP_UNLOCK(pmp->pm_devvp, 0, td);
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index bfc26b4..ad6e1e9 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -296,10 +296,9 @@ nullfs_statfs(mp, sbp, td)
 }
 
 static int
-nullfs_sync(mp, waitfor, cred, td)
+nullfs_sync(mp, waitfor, td)
 	struct mount *mp;
 	int waitfor;
-	struct ucred *cred;
 	struct thread *td;
 {
 	/*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 46110b5..596adc9 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1169,7 +1169,7 @@ union_fsync(ap)
 	struct union_node *un = VTOUNION(ap->a_vp);
 
 	if ((targetvp = union_lock_other(un, td)) != NULLVP) {
-		error = VOP_FSYNC(targetvp, ap->a_cred, ap->a_waitfor, td);
+		error = VOP_FSYNC(targetvp, ap->a_waitfor, td);
 		union_unlock_other(targetvp, td);
 	}