From: tedu <tedu@openbsd.org>
Date: Sat, 12 Jul 2014 18:50:41 +0000 (+0000)
Subject: add a size argument to free. will be used soon, but for now default to 0.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6c33c037fa9a2b72654db896d582f01516ba5819;p=openbsd

add a size argument to free. will be used soon, but for now default to 0.
after discussions with beck deraadt kettenis.
---

diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 13de3bd2fbe..35faeb21c09 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.48 2014/07/08 17:19:25 deraadt Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.49 2014/07/12 18:50:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -593,7 +593,7 @@ msdosfs_reclaim(void *v)
 #if 0 /* XXX */
 	dep->de_flag = 0;
 #endif
-	free(dep, M_MSDOSFSNODE);
+	free(dep, M_MSDOSFSNODE, 0);
 	vp->v_data = NULL;
 	return (0);
 }
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 17dd9eb0a57..a96382bb1bf 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.67 2014/06/23 18:54:33 tobias Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.68 2014/07/12 18:50:41 tedu Exp $	*/
 /*	$NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $	*/
 
 /*-
@@ -586,8 +586,8 @@ error_exit:
 
 	if (pmp) {
 		if (pmp->pm_inusemap)
-			free(pmp->pm_inusemap, M_MSDOSFSFAT);
-		free(pmp, M_MSDOSFSMNT);
+			free(pmp->pm_inusemap, M_MSDOSFSFAT, 0);
+		free(pmp, M_MSDOSFSMNT, 0);
 		mp->mnt_data = (qaddr_t)0;
 	}
 	return (error);
@@ -627,8 +627,8 @@ msdosfs_unmount(struct mount *mp, int mntflags,struct proc *p)
 	error = VOP_CLOSE(vp,
 	   pmp->pm_flags & MSDOSFSMNT_RONLY ? FREAD : FREAD|FWRITE, NOCRED, p);
 	vput(vp);
-	free(pmp->pm_inusemap, M_MSDOSFSFAT);
-	free(pmp, M_MSDOSFSMNT);
+	free(pmp->pm_inusemap, M_MSDOSFSFAT, 0);
+	free(pmp, M_MSDOSFSMNT, 0);
 	mp->mnt_data = (qaddr_t)0;
 	mp->mnt_flag &= ~MNT_LOCAL;
 	return (error);