Eliminate unused and unnecessary "cred" argument from vinvalbuf()

13 files changed, 25 insertions, 27 deletions

diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 0bf2e77..7c42521 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -374,7 +374,7 @@ hpfs_unmount(
 		return (error);
 	}
 
-	vinvalbuf(hpmp->hpm_devvp, V_SAVE, NOCRED, td, 0, 0);
+	vinvalbuf(hpmp->hpm_devvp, V_SAVE, td, 0, 0);
 	g_wither_geom_close(hpmp->hpm_cp->geom, ENXIO);
 	vrele(hpmp->hpm_devvp);
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 6e8288a..c602220 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -485,7 +485,7 @@ ntfs_unmount(
 	if (error)
 		printf("ntfs_unmount: vflush failed(sysnodes): %d\n",error);
 
-	vinvalbuf(ntmp->ntm_devvp, V_SAVE, NOCRED, td, 0, 0);
+	vinvalbuf(ntmp->ntm_devvp, V_SAVE, td, 0, 0);
 
 	DROP_GIANT();
 	g_topology_lock();
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 9168e96..5d51754 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -621,7 +621,7 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			return EINTR;
 	}
 	np->n_flag |= NFLUSHINPROG;
-	error = vinvalbuf(vp, flags, cred, td, slpflag, 0);
+	error = vinvalbuf(vp, flags, td, slpflag, 0);
 	while (error) {
 		if (intrflg && (error == ERESTART || error == EINTR)) {
 			np->n_flag &= ~NFLUSHINPROG;
@@ -631,7 +631,7 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			}
 			return EINTR;
 		}
-		error = vinvalbuf(vp, flags, cred, td, slpflag, 0);
+		error = vinvalbuf(vp, flags, td, slpflag, 0);
 	}
 	np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
 	if (np->n_flag & NFLUSHWANT) {
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 9e49732..846b081 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -695,7 +695,7 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			return EINTR;
 	}
 	np->n_flag |= NFLUSHINPROG;
-	error = vinvalbuf(vp, flags, cred, td, slpflag, 0);
+	error = vinvalbuf(vp, flags, td, slpflag, 0);
 	while (error) {
 		if (intrflg && (error == ERESTART || error == EINTR)) {
 			np->n_flag &= ~NFLUSHINPROG;
@@ -705,7 +705,7 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			}
 			return EINTR;
 		}
-		error = vinvalbuf(vp, flags, cred, td, slpflag, 0);
+		error = vinvalbuf(vp, flags, td, slpflag, 0);
 	}
 	np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
 	if (np->n_flag & NFLUSHWANT) {
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 9cd8916..5db1ef7 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -507,7 +507,7 @@ ext2_reload(mp, cred, td)
 	 */
 	devvp = VFSTOEXT2(mp)->um_devvp;
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
-	if (vinvalbuf(devvp, 0, cred, td, 0, 0) != 0)
+	if (vinvalbuf(devvp, 0, td, 0, 0) != 0)
 		panic("ext2_reload: dirty1");
 	VOP_UNLOCK(devvp, 0, td);
 
@@ -557,7 +557,7 @@ loop:
 		if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) {
 			goto loop;
 		}
-		if (vinvalbuf(vp, 0, cred, td, 0, 0))
+		if (vinvalbuf(vp, 0, td, 0, 0))
 			panic("ext2_reload: dirty2");
 		/*
 		 * Step 6: re-read inode data for all active vnodes.
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 9cd8916..5db1ef7 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -507,7 +507,7 @@ ext2_reload(mp, cred, td)
 	 */
 	devvp = VFSTOEXT2(mp)->um_devvp;
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
-	if (vinvalbuf(devvp, 0, cred, td, 0, 0) != 0)
+	if (vinvalbuf(devvp, 0, td, 0, 0) != 0)
 		panic("ext2_reload: dirty1");
 	VOP_UNLOCK(devvp, 0, td);
 
@@ -557,7 +557,7 @@ loop:
 		if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) {
 			goto loop;
 		}
-		if (vinvalbuf(vp, 0, cred, td, 0, 0))
+		if (vinvalbuf(vp, 0, td, 0, 0))
 			panic("ext2_reload: dirty2");
 		/*
 		 * Step 6: re-read inode data for all active vnodes.
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 5e007e8..cb2f1b4 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -681,7 +681,7 @@ vfs_domount(
 				return (error);
 			}
 		}
-		error = vinvalbuf(vp, V_SAVE, td->td_ucred, td, 0, 0);
+		error = vinvalbuf(vp, V_SAVE, td, 0, 0);
 		if (error != 0) {
 			vput(vp);
 			return (error);
@@ -1105,7 +1105,7 @@ devfs_fixup(struct thread *td)
 	if (vp->v_type != VDIR) {
 		vput(vp);
 	}
-	error = vinvalbuf(vp, V_SAVE, td->td_ucred, td, 0, 0);
+	error = vinvalbuf(vp, V_SAVE, td, 0, 0);
 	if (error) {
 		vput(vp);
 	}
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 4fda763..006d6e3 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -910,10 +910,9 @@ insmntque(struct vnode *vp, struct mount *mp)
  * Called with the underlying object locked.
  */
 int
-vinvalbuf(vp, flags, cred, td, slpflag, slptimeo)
+vinvalbuf(vp, flags, td, slpflag, slptimeo)
 	struct vnode *vp;
 	int flags;
-	struct ucred *cred;
 	struct thread *td;
 	int slpflag, slptimeo;
 {
@@ -2235,8 +2234,8 @@ vclean(vp, flags, td)
 		bp = TAILQ_FIRST(&vp->v_bufobj.bo_dirty.bv_hd);
 		if (bp != NULL)
 			(void) vn_write_suspend_wait(vp, NULL, V_WAIT);
-		if (vinvalbuf(vp, V_SAVE, NOCRED, td, 0, 0) != 0)
-			vinvalbuf(vp, 0, NOCRED, td, 0, 0);
+		if (vinvalbuf(vp, V_SAVE, td, 0, 0) != 0)
+			vinvalbuf(vp, 0, td, 0, 0);
 	}
 
 	VOP_DESTROYVOBJECT(vp);
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 9a187e5..beaa0b1 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -1261,11 +1261,11 @@ nfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred,
 	/*
 	 * Now, flush as required.
 	 */
-	error = vinvalbuf(vp, flags, cred, td, slpflag, 0);
+	error = vinvalbuf(vp, flags, td, slpflag, 0);
 	while (error) {
 		if (intrflg && (error = nfs_sigintr(nmp, NULL, td)))
 			goto out;
-		error = vinvalbuf(vp, flags, cred, td, 0, slptimeo);
+		error = vinvalbuf(vp, flags, td, 0, slptimeo);
 	}
 	np->n_flag &= ~NMODIFIED;
 out:
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 892e494..0c17253 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -605,7 +605,7 @@ void	vgone(struct vnode *vp);
 void	vgonel(struct vnode *vp, struct thread *td);
 void	vhold(struct vnode *);
 void	vholdl(struct vnode *);
-int	vinvalbuf(struct vnode *vp, int save, struct ucred *cred,
+int	vinvalbuf(struct vnode *vp, int save,
 	    struct thread *td, int slpflag, int slptimeo);
 int	vtruncbuf(struct vnode *vp, struct ucred *cred, struct thread *td,
 	    off_t length, int blksize);
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 3987e6e..2fa6d01 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -199,7 +199,7 @@ ffs_truncate(vp, length, flags, cred, td)
 #ifdef QUOTA
 			(void) chkdq(oip, -extblocks, NOCRED, 0);
 #endif
-			vinvalbuf(ovp, V_ALT, cred, td, 0, 0);
+			vinvalbuf(ovp, V_ALT, td, 0, 0);
 			oip->i_din2->di_extsize = 0;
 			for (i = 0; i < NXADDR; i++) {
 				oldblks[i] = oip->i_din2->di_extb[i];
@@ -272,8 +272,7 @@ ffs_truncate(vp, length, flags, cred, td)
 #endif
 			softdep_setup_freeblocks(oip, length, needextclean ?
 			    IO_EXT | IO_NORMAL : IO_NORMAL);
-			vinvalbuf(ovp, needextclean ? 0 : V_NORMAL,
-			    cred, td, 0, 0);
+			vinvalbuf(ovp, needextclean ? 0 : V_NORMAL, td, 0, 0);
 			oip->i_flag |= IN_CHANGE | IN_UPDATE;
 			return (ffs_update(ovp, 0));
 		}
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e3fcf95..9ca5ccd 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -408,7 +408,7 @@ ffs_reload(struct mount *mp, struct thread *td)
 	 */
 	devvp = VFSTOUFS(mp)->um_devvp;
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
-	if (vinvalbuf(devvp, 0, td->td_ucred, td, 0, 0) != 0)
+	if (vinvalbuf(devvp, 0, td, 0, 0) != 0)
 		panic("ffs_reload: dirty1");
 	VOP_CREATEVOBJECT(devvp, td->td_ucred, td);
 	VOP_UNLOCK(devvp, 0, td);
@@ -500,7 +500,7 @@ loop:
 		if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) {
 			goto loop;
 		}
-		if (vinvalbuf(vp, 0, td->td_ucred, td, 0, 0))
+		if (vinvalbuf(vp, 0, td, 0, 0))
 			panic("ffs_reload: dirty2");
 		/*
 		 * Step 6: re-read inode data for all active vnodes.
@@ -778,7 +778,7 @@ ffs_mountfs(devvp, mp, td)
 out:
 	if (bp)
 		brelse(bp);
-	vinvalbuf(devvp, V_SAVE, NOCRED, td, 0, 0);
+	vinvalbuf(devvp, V_SAVE, td, 0, 0);
 	if (cp != NULL) {
 		DROP_GIANT();
 		g_topology_lock();
@@ -937,7 +937,7 @@ ffs_unmount(mp, mntflags, td)
 			return (error);
 		}
 	}
-	vinvalbuf(ump->um_devvp, V_SAVE, NOCRED, td, 0, 0);
+	vinvalbuf(ump->um_devvp, V_SAVE, td, 0, 0);
 	DROP_GIANT();
 	g_topology_lock();
 	g_wither_geom_close(ump->um_cp->geom, ENXIO);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 264150f..178cfce 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -592,7 +592,7 @@ vm_object_terminate(vm_object_t object)
 		vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
 		VM_OBJECT_UNLOCK(object);
 
-		vinvalbuf(vp, V_SAVE, NOCRED, NULL, 0, 0);
+		vinvalbuf(vp, V_SAVE, NULL, 0, 0);
 
 		VM_OBJECT_LOCK(object);
 	}