we're not going to be using kauth_creds

5 files changed, 14 insertions, 16 deletions

diff --git a/usr.sbin/makefs/ffs/buf.h b/usr.sbin/makefs/ffs/buf.h
index 5f0fddf3df1..7ae3da42a02 100644
--- a/usr.sbin/makefs/ffs/buf.h
+++ b/usr.sbin/makefs/ffs/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: buf.h,v 1.3 2016/10/16 22:33:46 tedu Exp $	*/
 /*	$NetBSD: buf.h,v 1.10 2015/03/29 05:52:59 agc Exp $	*/
 
 /*
@@ -74,7 +74,6 @@ struct buf {
 	TAILQ_ENTRY(buf)	b_tailq;
 };
 
-struct kauth_cred;
 void		bcleanup(void);
 int		bread(struct vnode *, daddr_t, int, int, struct buf **);
 void		brelse(struct buf *, int);
diff --git a/usr.sbin/makefs/fs/msdosfs/denode.h b/usr.sbin/makefs/fs/msdosfs/denode.h
index bdcf608c793..c95c19f7561 100644
--- a/usr.sbin/makefs/fs/msdosfs/denode.h
+++ b/usr.sbin/makefs/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: denode.h,v 1.4 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: denode.h,v 1.5 2016/10/16 22:33:46 tedu Exp $	*/
 /*	$NetBSD: denode.h,v 1.24 2014/07/08 09:21:52 hannken Exp $	*/
 
 /*-
@@ -299,20 +299,19 @@ int	msdosfs_pathconf	(void *);
  */
 struct componentname;
 struct direntry;
-struct kauth_cred;
 int msdosfs_update(struct vnode *, const struct timespec *,
 	    const struct timespec *, int);
 int createde(struct denode *, struct denode *,
 		struct denode **, struct componentname *);
-int deextend(struct denode *, u_long, struct kauth_cred *);
+int deextend(struct denode *, u_long);
 int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
-int detrunc(struct denode *, u_long, int, struct kauth_cred *);
+int detrunc(struct denode *, u_long, int);
 int deupdat(struct denode *, int);
 int readde(struct denode *, struct buf **, struct direntry **);
 int readep(struct msdosfsmount *, u_long, u_long,
 		struct buf **, struct direntry **);
 int uniqdosname(struct denode *, struct componentname *, u_char *);
-int msdosfs_gop_alloc(struct vnode *, off_t, off_t, int, struct kauth_cred *);
+int msdosfs_gop_alloc(struct vnode *, off_t, off_t, int);
 void msdosfs_gop_markupdate(struct vnode *, int);
 void msdosfs_detimes(struct denode *, const struct timespec *,
     const struct timespec *, const struct timespec *, int);
diff --git a/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c b/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c
index 4e747e2e5f9..cc5ca09b560 100644
--- a/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c
+++ b/usr.sbin/makefs/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_lookup.c,v 1.4 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: msdosfs_lookup.c,v 1.5 2016/10/16 22:33:46 tedu Exp $	*/
 /*	$NetBSD: msdosfs_lookup.c,v 1.35 2016/01/30 09:59:27 mlelstv Exp $	*/
 
 /*-
@@ -98,7 +98,7 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct c
 		    - ddep->de_FileSize;
 		dirclust = de_clcount(pmp, needlen);
 		if ((error = extendfile(ddep, dirclust, 0, 0, DE_CLEAR)) != 0) {
-			(void)detrunc(ddep, ddep->de_FileSize, 0, NOCRED);
+			(void)detrunc(ddep, ddep->de_FileSize, 0);
 			goto err_norollback;
 		}
 
diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c
index 12587eeafa8..655db20b79e 100644
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.2 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.3 2016/10/16 22:33:46 tedu Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.7 2015/03/29 05:52:59 agc Exp $	*/
 
 /*-
@@ -189,7 +189,7 @@ deget(struct msdosfsmount *pmp, u_long dirclust, u_long diroffset,
  * Truncate the file described by dep to the length specified by length.
  */
 int
-detrunc(struct denode *dep, u_long length, int flags, struct kauth_cred *cred)
+detrunc(struct denode *dep, u_long length, int flags)
 {
 	int error;
 	int allerror = 0;
@@ -220,7 +220,7 @@ detrunc(struct denode *dep, u_long length, int flags, struct kauth_cred *cred)
 	}
 
 	if (dep->de_FileSize < length)
-		return (deextend(dep, length, cred));
+		return (deextend(dep, length));
 	lastblock = de_clcount(pmp, length) - 1;
 
 	/*
@@ -312,7 +312,7 @@ detrunc(struct denode *dep, u_long length, int flags, struct kauth_cred *cred)
  * Extend the file described by dep to length specified by length.
  */
 int
-deextend(struct denode *dep, u_long length, struct kauth_cred *cred)
+deextend(struct denode *dep, u_long length)
 {
 	struct msdosfsmount *pmp = dep->de_pmp;
 	u_long count;
@@ -343,7 +343,7 @@ deextend(struct denode *dep, u_long length, struct kauth_cred *cred)
 		error = extendfile(dep, count, NULL, NULL, DE_CLEAR);
 		if (error) {
 			/* truncate the added clusters away again */
-			(void) detrunc(dep, dep->de_FileSize, 0, cred);
+			(void) detrunc(dep, dep->de_FileSize, 0);
 			return (error);
 		}
 	}
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index 8e956b74002..cb6eb488a55 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.3 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.4 2016/10/16 22:33:46 tedu Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.17 2016/01/30 09:59:27 mlelstv Exp $ */
 
 /*-
@@ -426,7 +426,7 @@ msdosfs_wfile(const char *path, struct denode *dep, fsnode *node)
 	nsize = st->st_size;
 	DPRINTF(("%s(nsize=%zu, osize=%zu)\n", __func__, nsize, osize));
 	if (nsize > osize) {
-		if ((error = deextend(dep, nsize, NULL)) != 0) {
+		if ((error = deextend(dep, nsize)) != 0) {
 			errno = error;
 			return -1;
 		}