add a size argument to free. will be used soon, but for now default to 0.

after discussions with beck deraadt kettenis.

6 files changed, 28 insertions, 28 deletions

diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 8beaa39f51d..94ff10933d8 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_lookup.c,v 1.20 2013/06/11 16:42:15 deraadt Exp $	*/
+/*	$OpenBSD: cd9660_lookup.c,v 1.21 2014/07/12 18:50:00 tedu Exp $	*/
 /*	$NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $	*/
 
 /*-
@@ -287,10 +287,10 @@ searchloop:
 			cd9660_rrip_getname(ep,altname,&namelen,&dp->i_ino,imp);
 			if (namelen == cnp->cn_namelen
 			    && !bcmp(name,altname,namelen)) {
-				free(altname, M_TEMP);
+				free(altname, M_TEMP, 0);
 				goto found;
 			}
-			free(altname, M_TEMP);
+			free(altname, M_TEMP, 0);
 			ino = 0;
 			break;
 		}
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index b473466afcc..183b6bcc720 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.c,v 1.23 2013/06/02 01:07:39 deraadt Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.24 2014/07/12 18:50:00 tedu Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -217,7 +217,7 @@ cd9660_reclaim(v)
 		vrele(ip->i_devvp);
 		ip->i_devvp = 0;
 	}
-	free(vp->v_data, M_ISOFSNODE);
+	free(vp->v_data, M_ISOFSNODE, 0);
 	vp->v_data = NULL;
 	return (0);
 }
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 959a77ac47b..a9bdc9a27ea 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.67 2014/05/09 03:54:28 tedu Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.68 2014/07/12 18:50:00 tedu Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -109,7 +109,7 @@ cd9660_mountroot()
 	if ((error = iso_mountfs(rootvp, mp, p, &args)) != 0) {
 		mp->mnt_vfc->vfc_refcount--;
 		vfs_unbusy(mp);
-                free(mp, M_MOUNT);
+                free(mp, M_MOUNT, 0);
                 return (error);
         }
 
@@ -456,7 +456,7 @@ out:
 	VOP_UNLOCK(devvp, 0, p);
 
 	if (isomp) {
-		free((caddr_t)isomp, M_ISOFSMNT);
+		free((caddr_t)isomp, M_ISOFSMNT, 0);
 		mp->mnt_data = (qaddr_t)0;
 	}
 	return (error);
@@ -588,7 +588,7 @@ cd9660_unmount(mp, mntflags, p)
 	vn_lock(isomp->im_devvp, LK_EXCLUSIVE | LK_RETRY, p);
 	error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p);
 	vput(isomp->im_devvp);
-	free((caddr_t)isomp, M_ISOFSMNT);
+	free((caddr_t)isomp, M_ISOFSMNT, 0);
 	mp->mnt_data = (qaddr_t)0;
 	mp->mnt_flag &= ~MNT_LOCAL;
 	return (error);
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index f092f047f91..0198d763e11 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.65 2014/05/09 03:54:28 tedu Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.66 2014/07/12 18:50:00 tedu Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -198,7 +198,7 @@ cd9660_getattr(void *v)
 		rdlnk.a_cred = ap->a_cred;
 		if (cd9660_readlink(&rdlnk) == 0)
 			vap->va_size = MAXPATHLEN - auio.uio_resid;
-		free(cp, M_TEMP);
+		free(cp, M_TEMP, 0);
 	}
 	vap->va_flags	= 0;
 	vap->va_gen = 1;
@@ -262,7 +262,7 @@ cd9660_read(void *v)
 			}
 			error = breadn(vp, lbn, size, ra->blks,
 			    ra->sizes, i, &bp);
-			free(ra, M_TEMP);
+			free(ra, M_TEMP, 0);
 		} else
 			error = bread(vp, lbn, size, &bp);
 		ci->ci_lastr = lbn;
@@ -449,7 +449,7 @@ cd9660_readdir(void *v)
 
 	if ((entryoffsetinblock = idp->curroff & bmask) &&
 	    (error = cd9660_bufatoff(dp, (off_t)idp->curroff, NULL, &bp))) {
-		free(idp, M_TEMP);
+		free(idp, M_TEMP, 0);
 		return (error);
 	}
 	endsearch = dp->i_size;
@@ -562,7 +562,7 @@ cd9660_readdir(void *v)
 	uio->uio_offset = idp->uio_off;
 	*ap->a_eofflag = idp->eofflag;
 
-	free(idp, M_TEMP);
+	free(idp, M_TEMP, 0);
 
 	return (error);
 }
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 68842c81a63..e12553b9d97 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vfsops.c,v 1.41 2013/05/30 17:35:01 guenther Exp $	*/
+/*	$OpenBSD: udf_vfsops.c,v 1.42 2014/07/12 18:50:00 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -438,10 +438,10 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, uint32_t lb, struct proc *p)
 
 bail:
 	if (ump->um_hashtbl != NULL)
-		free(ump->um_hashtbl, M_UDFMOUNT);
+		free(ump->um_hashtbl, M_UDFMOUNT, 0);
 
 	if (ump != NULL) {
-		free(ump, M_UDFMOUNT);
+		free(ump, M_UDFMOUNT, 0);
 		mp->mnt_data = NULL;
 		mp->mnt_flag &= ~MNT_LOCAL;
 	}
@@ -482,15 +482,15 @@ udf_unmount(struct mount *mp, int mntflags, struct proc *p)
 	vrele(devvp);
 
 	if (ump->um_flags & UDF_MNT_USES_VAT)
-		free(ump->um_vat, M_UDFMOUNT);
+		free(ump->um_vat, M_UDFMOUNT, 0);
 
 	if (ump->um_stbl != NULL)
-		free(ump->um_stbl, M_UDFMOUNT);
+		free(ump->um_stbl, M_UDFMOUNT, 0);
 
 	if (ump->um_hashtbl != NULL)
-		free(ump->um_hashtbl, M_UDFMOUNT);
+		free(ump->um_hashtbl, M_UDFMOUNT, 0);
 
-	free(ump, M_UDFMOUNT);
+	free(ump, M_UDFMOUNT, 0);
 
 	mp->mnt_data = (qaddr_t)0;
 	mp->mnt_flag &= ~MNT_LOCAL;
@@ -634,7 +634,7 @@ udf_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
 	bp = NULL;
 
 	if ((error = udf_allocv(mp, &vp, p))) {
-		free(up->u_fentry, M_UDFFENTRY);
+		free(up->u_fentry, M_UDFFENTRY, 0);
 		pool_put(&unode_pool, up);
 		return (error); /* Error from udf_allocv() */
 	}
@@ -792,7 +792,7 @@ udf_get_spartmap(struct umount *ump, struct part_map_spare *pms)
 	if (error) {
 		if (bp != NULL)
 			brelse(bp);
-		free(ump->um_stbl, M_UDFMOUNT);
+		free(ump->um_stbl, M_UDFMOUNT, 0);
 		return (error); /* Failed to read sparing table */
 	}
 
@@ -801,7 +801,7 @@ udf_get_spartmap(struct umount *ump, struct part_map_spare *pms)
 	bp = NULL;
 
 	if (udf_checktag(&ump->um_stbl->tag, 0)) {
-		free(ump->um_stbl, M_UDFMOUNT);
+		free(ump->um_stbl, M_UDFMOUNT, 0);
 		return (EINVAL); /* Invalid sparing table found */
 	}
 
diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c
index 454f21db8e0..4a4a45c2e17 100644
--- a/sys/isofs/udf/udf_vnops.c
+++ b/sys/isofs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vnops.c,v 1.54 2013/12/14 02:57:25 guenther Exp $	*/
+/*	$OpenBSD: udf_vnops.c,v 1.55 2014/07/12 18:50:00 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -598,7 +598,7 @@ udf_getfid(struct udf_dirstream *ds)
 	 */
 	if (ds->fid_fragment && ds->buf != NULL) {
 		ds->fid_fragment = 0;
-		free(ds->buf, M_UDFFID);
+		free(ds->buf, M_UDFFID, 0);
 	}
 
 	fid = (struct fileid_desc*)&ds->data[ds->off];
@@ -699,7 +699,7 @@ udf_closedir(struct udf_dirstream *ds)
 	}
 
 	if (ds->fid_fragment && ds->buf != NULL)
-		free(ds->buf, M_UDFFID);
+		free(ds->buf, M_UDFFID, 0);
 
 	pool_put(&udf_ds_pool, ds);
 }
@@ -1172,7 +1172,7 @@ udf_reclaim(void *v)
 		}
 
 		if (up->u_fentry != NULL)
-			free(up->u_fentry, M_UDFFENTRY);
+			free(up->u_fentry, M_UDFFENTRY, 0);
 
 		pool_put(&unode_pool, up);
 		vp->v_data = NULL;