diff options
Diffstat (limited to 'sys/fs')
27 files changed, 131 insertions, 136 deletions
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index bc852ae..d8db8b5 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -111,7 +111,7 @@ cd9660_reclaim(ap) */ if (ip->i_mnt->im_devvp) vrele(ip->i_mnt->im_devvp); - FREE(vp->v_data, M_ISOFSNODE); + free(vp->v_data, M_ISOFSNODE); vp->v_data = NULL; return (0); } diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index f4ff62d..7a8953d 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -676,7 +676,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir) *vpp = NULLVP; return (error); } - MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE, + ip = malloc(sizeof(struct iso_node), M_ISOFSNODE, M_WAITOK | M_ZERO); vp->v_data = ip; ip->i_vnode = vp; diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 5f4bfe8..76fb233 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -207,7 +207,7 @@ cd9660_getattr(ap) struct uio auio; char *cp; - MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK); + cp = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); aiov.iov_base = cp; aiov.iov_len = MAXPATHLEN; auio.uio_iov = &aiov; @@ -222,7 +222,7 @@ cd9660_getattr(ap) 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); } vap->va_flags = 0; vap->va_gen = 1; @@ -470,7 +470,7 @@ cd9660_readdir(ap) imp = dp->i_mnt; bmask = imp->im_bmask; - MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK); + idp = malloc(sizeof(*idp), M_TEMP, M_WAITOK); idp->saveent.d_namlen = idp->assocent.d_namlen = 0; /* * XXX @@ -486,7 +486,7 @@ cd9660_readdir(ap) * Guess the number of cookies needed. */ ncookies = uio->uio_resid / 16; - MALLOC(cookies, u_long *, ncookies * sizeof(u_long), + cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK); idp->cookies = cookies; idp->ncookies = ncookies; @@ -497,7 +497,7 @@ cd9660_readdir(ap) if ((entryoffsetinblock = idp->curroff & bmask) && (error = cd9660_blkatoff(vdp, (off_t)idp->curroff, NULL, &bp))) { - FREE(idp, M_TEMP); + free(idp, M_TEMP); return (error); } endsearch = dp->i_size; @@ -620,7 +620,7 @@ cd9660_readdir(ap) uio->uio_offset = idp->uio_off; *ap->a_eofflag = idp->eofflag; - FREE(idp, M_TEMP); + free(idp, M_TEMP); return (error); } diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 1994c13..9651313 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -85,7 +85,7 @@ fdesc_mount(struct mount *mp, struct thread *td) if (mp->mnt_flag & (MNT_UPDATE | MNT_ROOTFS)) return (EOPNOTSUPP); - MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount), + fmp = malloc(sizeof(struct fdescmount), M_FDESCMNT, M_WAITOK); /* XXX */ /* diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 289f29d..d1788ae 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -186,11 +186,11 @@ loop: } mtx_unlock(&fdesc_hashmtx); - MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); + fd = malloc(sizeof(struct fdescnode), M_TEMP, M_WAITOK); error = getnewvnode("fdescfs", mp, &fdesc_vnodeops, &vp); if (error) { - FREE(fd, M_TEMP); + free(fd, M_TEMP); return (error); } vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); @@ -616,7 +616,7 @@ fdesc_reclaim(ap) vp = ap->a_vp; fd = VTOFDESC(vp); fdesc_remove_entry(fd); - FREE(vp->v_data, M_TEMP); + free(vp->v_data, M_TEMP); vp->v_data = NULL; return (0); } diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 051b59b..a875c05 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -154,7 +154,7 @@ fifo_cleanup(struct vnode *vp) vp->v_fifoinfo = NULL; (void)soclose(fip->fi_readsock); (void)soclose(fip->fi_writesock); - FREE(fip, M_VNODE); + free(fip, M_VNODE); } } @@ -185,7 +185,7 @@ fifo_open(ap) if (fp == NULL) return (EINVAL); if ((fip = vp->v_fifoinfo) == NULL) { - MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK); + fip = malloc(sizeof(*fip), M_VNODE, M_WAITOK); error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, cred, td); if (error) goto fail1; diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c index 6844545..ae9a70d 100644 --- a/sys/fs/hpfs/hpfs_subr.c +++ b/sys/fs/hpfs/hpfs_subr.c @@ -85,8 +85,8 @@ hpfs_bmdeinit( } } - FREE(hpmp->hpm_bitmap,M_HPFSMNT); - FREE(hpmp->hpm_bmind,M_HPFSMNT); + free(hpmp->hpm_bitmap,M_HPFSMNT); + free(hpmp->hpm_bmind,M_HPFSMNT); dprintf(("\n")); } @@ -109,18 +109,18 @@ hpfs_bminit( dprintf(("0x%lx data bands, ", hpmp->hpm_dbnum)); - MALLOC(hpmp->hpm_bmind, lsn_t *, hpmp->hpm_dbnum * sizeof(lsn_t), + hpmp->hpm_bmind = malloc(hpmp->hpm_dbnum * sizeof(lsn_t), M_HPFSMNT, M_WAITOK); - MALLOC(hpmp->hpm_bitmap, u_int8_t *, hpmp->hpm_dbnum * BMSIZE, + hpmp->hpm_bitmap = malloc(hpmp->hpm_dbnum * BMSIZE, M_HPFSMNT, M_WAITOK); error = bread(hpmp->hpm_devvp, hpmp->hpm_su.su_bitmap.lsn1, ((hpmp->hpm_dbnum + 0x7F) & ~(0x7F)) << 2, NOCRED, &bp); if (error) { brelse(bp); - FREE(hpmp->hpm_bitmap, M_HPFSMNT); - FREE(hpmp->hpm_bmind, M_HPFSMNT); + free(hpmp->hpm_bitmap, M_HPFSMNT); + free(hpmp->hpm_bmind, M_HPFSMNT); dprintf((" error %d\n", error)); return (error); } @@ -138,8 +138,8 @@ hpfs_bminit( BMSIZE, NOCRED, &bp); if (error) { brelse(bp); - FREE(hpmp->hpm_bitmap, M_HPFSMNT); - FREE(hpmp->hpm_bmind, M_HPFSMNT); + free(hpmp->hpm_bitmap, M_HPFSMNT); + free(hpmp->hpm_bmind, M_HPFSMNT); dprintf((" error %d\n", error)); return (error); } @@ -278,8 +278,7 @@ hpfs_cpinit ( cpicnt = hpmp->hpm_sp.sp_cpinum; - MALLOC(hpmp->hpm_cpdblk, struct cpdblk *, - cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK); + hpmp->hpm_cpdblk = malloc( cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK); cpdbp = hpmp->hpm_cpdblk; lsn = hpmp->hpm_sp.sp_cpi; @@ -317,7 +316,7 @@ hpfs_cpdeinit ( struct hpfsmount *hpmp) { dprintf(("hpmp_cpdeinit: ")); - FREE(hpmp->hpm_cpdblk,M_HPFSMNT); + free(hpmp->hpm_cpdblk,M_HPFSMNT); return (0); } diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index 02b5ea4..36d3dd5 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -371,7 +371,7 @@ hpfs_unmount( MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); - FREE(hpmp, M_HPFSMNT); + free(hpmp, M_HPFSMNT); return (0); } @@ -476,13 +476,13 @@ hpfs_vget( * at that time is little, and anyway - we'll * check for it). */ - MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), + hp = malloc(sizeof(struct hpfsnode), M_HPFSNO, M_WAITOK); error = getnewvnode("hpfs", mp, &hpfs_vnodeops, &vp); if (error) { printf("hpfs_vget: can't get new vnode\n"); - FREE(hp, M_HPFSNO); + free(hp, M_HPFSNO); return (error); } diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index ed343e0..af7cd52 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -611,7 +611,7 @@ hpfs_reclaim(ap) vp->v_data = NULL; - FREE(hp, M_HPFSNO); + free(hp, M_HPFSNO); return (0); } @@ -1003,7 +1003,7 @@ readdone: dpStart = (struct dirent *) ((caddr_t)uio->uio_iov->iov_base - (uio->uio_offset - off)); - MALLOC(cookies, u_long *, ncookies * sizeof(u_long), + cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK); for (dp = dpStart, cookiep = cookies, i=0; i < ncookies; diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 8fd61cd..d461484 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -148,7 +148,7 @@ deget(pmp, dirclust, diroffset, depp) * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK); + ldep = malloc(sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK); /* * Directory entry was not in cache, have to create a vnode and @@ -158,7 +158,7 @@ deget(pmp, dirclust, diroffset, depp) error = getnewvnode("msdosfs", mntp, &msdosfs_vnodeops, &nvp); if (error) { *depp = NULL; - FREE(ldep, M_MSDOSFSNODE); + free(ldep, M_MSDOSFSNODE); return error; } bzero((caddr_t)ldep, sizeof *ldep); @@ -173,7 +173,7 @@ deget(pmp, dirclust, diroffset, depp) lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL); error = insmntque(nvp, mntp); if (error != 0) { - FREE(ldep, M_MSDOSFSNODE); + free(ldep, M_MSDOSFSNODE); *depp = NULL; return (error); } @@ -567,7 +567,7 @@ msdosfs_reclaim(ap) #if 0 /* XXX */ dep->de_flag = 0; #endif - FREE(dep, M_MSDOSFSNODE); + free(dep, M_MSDOSFSNODE); vp->v_data = NULL; return (0); diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index e16da65..877e492 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1561,7 +1561,7 @@ msdosfs_readdir(ap) if (ap->a_ncookies) { ncookies = uio->uio_resid / 16; - MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP, + cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK); *ap->a_cookies = cookies; *ap->a_ncookies = ncookies; diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index f06ddeb..e50cdf2 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -190,7 +190,7 @@ ntfs_ntvattrget( } /* Scan $ATTRIBUTE_LIST for requested attribute */ len = lvap->va_datalen; - MALLOC(alpool, caddr_t, len, M_TEMP, M_WAITOK); + alpool = malloc(len, M_TEMP, M_WAITOK); error = ntfs_readntvattr_plain(ntmp, ip, lvap, 0, len, alpool, &len, NULL); if (error) @@ -246,7 +246,7 @@ ntfs_ntvattrget( "ino: %d, type: 0x%x, name: %.*s, vcn: %d\n", \ ip->i_number, type, (int) namelen, name, (u_int32_t) vcn)); out: - FREE(alpool, M_TEMP); + free(alpool, M_TEMP); return (error); } @@ -268,7 +268,7 @@ ntfs_loadntnode( dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number)); - MALLOC(mfrp, struct filerec *, ntfs_bntob(ntmp->ntm_bpmftrec), + mfrp = malloc(ntfs_bntob(ntmp->ntm_bpmftrec), M_TEMP, M_WAITOK); if (ip->i_number < NTFS_SYSNODESNUM) { @@ -341,7 +341,7 @@ ntfs_loadntnode( ip->i_flag |= IN_LOADED; out: - FREE(mfrp, M_TEMP); + free(mfrp, M_TEMP); return (error); } @@ -391,7 +391,7 @@ ntfs_ntlookup( } } while (lockmgr(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL, NULL)); - MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE, + ip = malloc(sizeof(struct ntnode), M_NTFSNTNODE, M_WAITOK | M_ZERO); ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip)); @@ -466,7 +466,7 @@ ntfs_ntput(ip) mtx_destroy(&ip->i_interlock); lockdestroy(&ip->i_lock); vrele(ip->i_devvp); - FREE(ip, M_NTFSNTNODE); + free(ip, M_NTFSNTNODE); } /* @@ -513,14 +513,14 @@ ntfs_freentvattr(vap) { if (vap->va_flag & NTFS_AF_INRUN) { if (vap->va_vruncn) - FREE(vap->va_vruncn, M_NTFSRUN); + free(vap->va_vruncn, M_NTFSRUN); if (vap->va_vruncl) - FREE(vap->va_vruncl, M_NTFSRUN); + free(vap->va_vruncl, M_NTFSRUN); } else { if (vap->va_datap) - FREE(vap->va_datap, M_NTFSRDATA); + free(vap->va_datap, M_NTFSRDATA); } - FREE(vap, M_NTFSNTVATTR); + free(vap, M_NTFSNTVATTR); } /* @@ -539,7 +539,7 @@ ntfs_attrtontvattr( error = 0; *rvapp = NULL; - MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr), + vap = malloc(sizeof(struct ntvattr), M_NTFSNTVATTR, M_WAITOK | M_ZERO); vap->va_ip = NULL; vap->va_flag = rap->a_hdr.a_flag; @@ -576,7 +576,7 @@ ntfs_attrtontvattr( vap->va_allocated = rap->a_r.a_datalen; vap->va_vcnstart = 0; vap->va_vcnend = ntfs_btocn(vap->va_allocated); - MALLOC(vap->va_datap, caddr_t, vap->va_datalen, + vap->va_datap = malloc(vap->va_datalen, M_NTFSRDATA, M_WAITOK); memcpy(vap->va_datap, (caddr_t) rap + rap->a_r.a_dataoff, rap->a_r.a_datalen); @@ -584,7 +584,7 @@ ntfs_attrtontvattr( ddprintf((", len: %d", vap->va_datalen)); if (error) - FREE(vap, M_NTFSNTVATTR); + free(vap, M_NTFSNTVATTR); else *rvapp = vap; @@ -618,8 +618,8 @@ ntfs_runtovrun( off += (run[off] & 0xF) + ((run[off] >> 4) & 0xF) + 1; cnt++; } - MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK); - MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK); + cn = malloc(cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK); + cl = malloc(cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK); off = 0; cnt = 0; @@ -769,14 +769,14 @@ ntfs_fget( if (*fpp) return (0); - MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE, + fp = malloc(sizeof(struct fnode), M_NTFSFNODE, M_WAITOK | M_ZERO); dprintf(("ntfs_fget: allocating fnode: %p\n",fp)); fp->f_ip = ip; if (attrname) { fp->f_flag |= FN_AATTRNAME; - MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, M_WAITOK); + fp->f_attrname = malloc(strlen(attrname)+1, M_TEMP, M_WAITOK); strcpy(fp->f_attrname, attrname); } else fp->f_attrname = NULL; @@ -807,10 +807,10 @@ ntfs_frele( dprintf(("ntfs_frele: deallocating fnode\n")); LIST_REMOVE(fp,f_fnlist); if (fp->f_flag & FN_AATTRNAME) - FREE(fp->f_attrname, M_TEMP); + free(fp->f_attrname, M_TEMP); if (fp->f_dirblbuf) - FREE(fp->f_dirblbuf, M_NTFSDIR); - FREE(fp, M_NTFSFNODE); + free(fp->f_dirblbuf, M_NTFSDIR); + free(fp, M_NTFSFNODE); ntfs_ntrele(ip); } @@ -861,7 +861,7 @@ ntfs_ntlookupattr( out: if (namelen) { - MALLOC((*attrname), char *, namelen, M_TEMP, M_WAITOK); + (*attrname) = malloc(namelen, M_TEMP, M_WAITOK); memcpy((*attrname), name, namelen); (*attrname)[namelen] = '\0'; } @@ -926,7 +926,7 @@ ntfs_ntlookupfile( dprintf(("ntfs_ntlookupfile: blksz: %d, rdsz: %jd\n", blsize, rdsize)); - MALLOC(rdbuf, caddr_t, blsize, M_TEMP, M_WAITOK); + rdbuf = malloc(blsize, M_TEMP, M_WAITOK); error = ntfs_readattr(ntmp, ip, NTFS_A_INDXROOT, "$I30", 0, rdsize, rdbuf, NULL); @@ -991,7 +991,7 @@ ntfs_ntlookupfile( /* free the buffer returned by ntfs_ntlookupattr() */ if (attrname) { - FREE(attrname, M_TEMP); + free(attrname, M_TEMP); attrname = NULL; } @@ -1069,10 +1069,10 @@ ntfs_ntlookupfile( dprintf(("finish\n")); fail: - if (attrname) FREE(attrname, M_TEMP); + if (attrname) free(attrname, M_TEMP); ntfs_ntvattrrele(vap); ntfs_ntput(ip); - FREE(rdbuf, M_TEMP); + free(rdbuf, M_TEMP); return (error); } @@ -1143,8 +1143,7 @@ ntfs_ntreaddir( if (fp->f_dirblbuf == NULL) { fp->f_dirblsz = vap->va_a_iroot->ir_size; - MALLOC(fp->f_dirblbuf, caddr_t, - max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, M_WAITOK); + fp->f_dirblbuf = malloc( max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, M_WAITOK); } blsize = fp->f_dirblsz; @@ -1159,7 +1158,7 @@ ntfs_ntreaddir( error = ENOTDIR; goto fail; } - MALLOC(bmp, u_int8_t *, bmvap->va_datalen, M_TEMP, M_WAITOK); + bmp = malloc(bmvap->va_datalen, M_TEMP, M_WAITOK); error = ntfs_readattr(ntmp, ip, NTFS_A_INDXBITMAP, "$I30", 0, bmvap->va_datalen, bmp, NULL); if (error) @@ -1265,7 +1264,7 @@ fail: if (iavap) ntfs_ntvattrrele(iavap); if (bmp) - FREE(bmp, M_TEMP); + free(bmp, M_TEMP); ntfs_ntput(ip); return (error); } @@ -1756,9 +1755,9 @@ ntfs_readattr( ddprintf(("ntfs_ntreadattr: compression: %d\n", vap->va_compressalg)); - MALLOC(cup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL), + cup = malloc(ntfs_cntob(NTFS_COMPUNIT_CL), M_NTFSDECOMP, M_WAITOK); - MALLOC(uup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL), + uup = malloc(ntfs_cntob(NTFS_COMPUNIT_CL), M_NTFSDECOMP, M_WAITOK); cn = (ntfs_btocn(roff)) & (~(NTFS_COMPUNIT_CL - 1)); @@ -1803,8 +1802,8 @@ ntfs_readattr( cn += NTFS_COMPUNIT_CL; } - FREE(uup, M_NTFSDECOMP); - FREE(cup, M_NTFSDECOMP); + free(uup, M_NTFSDECOMP); + free(cup, M_NTFSDECOMP); } else error = ntfs_readattr_plain(ntmp, ip, attrnum, attrname, roff, rsize, rdata, &init, uio); @@ -1991,7 +1990,7 @@ ntfs_toupper_use(mp, ntmp) * XXX for now, just the first 256 entries are used anyway, * so don't bother reading more */ - MALLOC(ntfs_toupper_tab, wchar *, 65536 * sizeof(wchar), + ntfs_toupper_tab = malloc(65536 * sizeof(wchar), M_NTFSRDATA, M_WAITOK); if ((error = VFS_VGET(mp, NTFS_UPCASEINO, LK_EXCLUSIVE, &vp))) @@ -2018,7 +2017,7 @@ ntfs_toupper_unuse() ntfs_toupper_usecount--; if (ntfs_toupper_usecount == 0) { - FREE(ntfs_toupper_tab, M_NTFSRDATA); + free(ntfs_toupper_tab, M_NTFSRDATA); ntfs_toupper_tab = NULL; } #ifdef DIAGNOSTIC @@ -2047,14 +2046,14 @@ ntfs_u28_init( return (0); } - MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_WAITOK | M_ZERO); + u28 = malloc(256 * sizeof(char*), M_TEMP, M_WAITOK | M_ZERO); for (i=0; i<256; i++) { h = (u2w[i] >> 8) & 0xFF; l = (u2w[i]) &0xFF; if (u28[h] == NULL) { - MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, M_WAITOK); + u28[h] = malloc(256 * sizeof(char), M_TEMP, M_WAITOK); for (j=0; j<256; j++) u28[h][j] = '_'; } @@ -2084,9 +2083,9 @@ ntfs_u28_uninit(struct ntfsmount *ntmp) for (i=0; i<256; i++) if (u28[i] != NULL) - FREE(u28[i], M_TEMP); + free(u28[i], M_TEMP); - FREE(u28, M_TEMP); + free(u28, M_TEMP); return (0); } @@ -2105,7 +2104,7 @@ ntfs_82u_init( return (0); } - MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, M_WAITOK); + _82u = malloc(256 * sizeof(wchar), M_TEMP, M_WAITOK); for (i=0; i<256; i++) _82u[i] = i; @@ -2126,7 +2125,7 @@ ntfs_82u_uninit(struct ntfsmount *ntmp) return (0); } - FREE(ntmp->ntm_82u, M_TEMP); + free(ntmp->ntm_82u, M_TEMP); return (0); } diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 86ff17a..6baaca1 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -416,8 +416,7 @@ ntfs_mountfs(devvp, mp, td) } /* Alloc memory for attribute definitions */ - MALLOC(ntmp->ntm_ad, struct ntvattrdef *, - num * sizeof(struct ntvattrdef), + ntmp->ntm_ad = malloc( num * sizeof(struct ntvattrdef), M_NTFSMNT, M_WAITOK); ntmp->ntm_adnum = num; @@ -526,8 +525,8 @@ ntfs_unmount( MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); - FREE(ntmp->ntm_ad, M_NTFSMNT); - FREE(ntmp, M_NTFSMNT); + free(ntmp->ntm_ad, M_NTFSMNT); + free(ntmp, M_NTFSMNT); return (error); } @@ -568,7 +567,7 @@ ntfs_calccfree( bmsize = VTOF(vp)->f_size; - MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, M_WAITOK); + tmp = malloc(bmsize, M_TEMP, M_WAITOK); error = ntfs_readattr(ntmp, VTONT(vp), NTFS_A_DATA, NULL, 0, bmsize, tmp, NULL); @@ -581,7 +580,7 @@ ntfs_calccfree( *cfreep = cfree; out: - FREE(tmp, M_TEMP); + free(tmp, M_TEMP); return(error); } diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 7bf8b28..991504c 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -595,7 +595,7 @@ ntfs_readdir(ap) dpStart = (struct dirent *) ((caddr_t)uio->uio_iov->iov_base - (uio->uio_offset - off)); - MALLOC(cookies, u_long *, ncookies * sizeof(u_long), + cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK); for (dp = dpStart, cookiep = cookies, i=0; i < ncookies; diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 44de4189..dd60ce8 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -173,7 +173,7 @@ null_insmntque_dtr(struct vnode *vp, void *xp) { vp->v_data = NULL; vp->v_vnlock = &vp->v_lock; - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); vp->v_op = &dead_vnodeops; (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vgone(vp); @@ -218,12 +218,12 @@ null_nodeget(mp, lowervp, vpp) * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(xp, struct null_node *, sizeof(struct null_node), + xp = malloc(sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); error = getnewvnode("null", mp, &null_vnodeops, &vp); if (error) { - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); return (error); } diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 4a41396..9b1edd9 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -677,7 +677,7 @@ null_reclaim(struct vop_reclaim_args *ap) vput(lowervp); } else panic("null_reclaim: reclaiming a node with no lowervp"); - FREE(xp, M_NULLFSNODE); + free(xp, M_NULLFSNODE); return (0); } diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 6082fde..29ad71c 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -169,16 +169,16 @@ rescan: * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); + np = malloc(sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); error = getnewvnode("nwfs", mp, &nwfs_vnodeops, &vp); if (error) { *vpp = NULL; - FREE(np, M_NWNODE); + free(np, M_NWNODE); return (error); } error = insmntque(vp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(np, M_NWNODE); + free(np, M_NWNODE); *vpp = NULL; return (error); } @@ -201,7 +201,7 @@ rescan: vp->v_data = NULL; np->n_vnode = NULL; vrele(vp); - FREE(np, M_NWNODE); + free(np, M_NWNODE); goto rescan; } *vpp = vp; @@ -283,7 +283,7 @@ nwfs_reclaim(ap) nmp->n_root = NULL; } vp->v_data = NULL; - FREE(np, M_NWNODE); + free(np, M_NWNODE); if (dvp) { vrele(dvp); } diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index f795b7a..a7880b6 100644 --- a/sys/fs/nwfs/nwfs_vfsops.c +++ b/sys/fs/nwfs/nwfs_vfsops.c @@ -114,7 +114,7 @@ nwfs_initnls(struct nwmount *nmp) { nmp->m.nls.u2n = ncp_defnls.u2n; return 0; } - MALLOC(pe, char *, 256 * 4, M_NWFSDATA, M_WAITOK); + pe = malloc(256 * 4, M_NWFSDATA, M_WAITOK); pc = pe; do { COPY_TABLE(nmp->m.nls.to_lower, ncp_defnls.to_lower); @@ -191,7 +191,7 @@ static int nwfs_mount(struct mount *mp, struct thread *td) ncp_conn_unlock(conn, td); /* we keep the ref */ mp->mnt_stat.f_iosize = conn->buffer_size; /* We must malloc our own mount info */ - MALLOC(nmp,struct nwmount *,sizeof(struct nwmount),M_NWFSDATA, + nmp = malloc(sizeof(struct nwmount),M_NWFSDATA, M_WAITOK | M_USE_RESERVE | M_ZERO); if (nmp == NULL) { nwfs_printf("could not alloc nwmount\n"); diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index cc02f13..c2057c6 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -122,24 +122,24 @@ portal_mount(struct mount *mp, struct thread *td) return (ESOCKTNOSUPPORT); } - MALLOC(pn, struct portalnode *, sizeof(struct portalnode), + pn = malloc(sizeof(struct portalnode), M_TEMP, M_WAITOK); - MALLOC(fmp, struct portalmount *, sizeof(struct portalmount), + fmp = malloc(sizeof(struct portalmount), M_PORTALFSMNT, M_WAITOK); /* XXX */ error = getnewvnode("portal", mp, &portal_vnodeops, &rvp); /* XXX */ if (error) { - FREE(fmp, M_PORTALFSMNT); - FREE(pn, M_TEMP); + free(fmp, M_PORTALFSMNT); + free(pn, M_TEMP); fdrop(fp, td); return (error); } error = insmntque(rvp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(fmp, M_PORTALFSMNT); - FREE(pn, M_TEMP); + free(fmp, M_PORTALFSMNT); + free(pn, M_TEMP); fdrop(fp, td); return (error); } diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index f05990c..8b49ad3 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -127,12 +127,12 @@ portal_lookup(ap) * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(pt, struct portalnode *, sizeof(struct portalnode), + pt = malloc(sizeof(struct portalnode), M_TEMP, M_WAITOK); error = getnewvnode("portal", dvp->v_mount, &portal_vnodeops, &fvp); if (error) { - FREE(pt, M_TEMP); + free(pt, M_TEMP); goto bad; } fvp->v_type = VREG; @@ -542,7 +542,7 @@ portal_reclaim(ap) free((caddr_t) pt->pt_arg, M_TEMP); pt->pt_arg = 0; } - FREE(ap->a_vp->v_data, M_TEMP); + free(ap->a_vp->v_data, M_TEMP); ap->a_vp->v_data = 0; return (0); diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index eb2d67d..f7a0426 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -71,7 +71,7 @@ pfs_alloc_node(struct pfs_info *pi, const char *name, pfs_type_t type) KASSERT(strlen(name) < PFS_NAMELEN, ("%s(): node name is too long", __func__)); - MALLOC(pn, struct pfs_node *, sizeof *pn, + pn = malloc(sizeof *pn, M_PFSNODES, M_WAITOK|M_ZERO); mtx_init(&pn->pn_mutex, "pfs_node", NULL, MTX_DEF | MTX_DUPOK); strlcpy(pn->pn_name, name, sizeof pn->pn_name); @@ -290,7 +290,7 @@ pfs_destroy(struct pfs_node *pn) /* destroy the node */ pfs_fileno_free(pn); mtx_destroy(&pn->pn_mutex); - FREE(pn, M_PFSNODES); + free(pn, M_PFSNODES); return (0); } diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c index 2e8040f..eac35eb 100644 --- a/sys/fs/pseudofs/pseudofs_vncache.c +++ b/sys/fs/pseudofs/pseudofs_vncache.c @@ -149,7 +149,7 @@ retry: ++pfs_vncache_misses; /* nope, get a new one */ - MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); + pvd = malloc(sizeof *pvd, M_PFSVNCACHE, M_WAITOK); mtx_lock(&pfs_vncache_mutex); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; @@ -159,7 +159,7 @@ retry: mtx_lock(&pfs_vncache_mutex); --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); return (error); } pvd->pvd_pn = pn; @@ -203,7 +203,7 @@ retry: mtx_lock(&pfs_vncache_mutex); --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); *vpp = NULLVP; return (error); } @@ -237,7 +237,7 @@ pfs_vncache_free(struct vnode *vp) --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - FREE(pvd, M_PFSVNCACHE); + free(pvd, M_PFSVNCACHE); vp->v_data = NULL; return (0); } diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 7ba7c5a..38464cd 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -229,15 +229,15 @@ loop: if (fap == NULL) return ENOENT; - MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK); + np = malloc(sizeof *np, M_SMBNODE, M_WAITOK); error = getnewvnode("smbfs", mp, &smbfs_vnodeops, &vp); if (error) { - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); return error; } error = insmntque(vp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); return (error); } vp->v_type = fap->fa_attr & SMB_FA_DIR ? VDIR : VREG; @@ -269,7 +269,7 @@ loop: continue; vput(vp); /* smb_name_free(np->n_name); - FREE(np, M_SMBNODE);*/ + free(np, M_SMBNODE);*/ goto loop; } LIST_INSERT_HEAD(nhpp, np, n_hash); @@ -335,7 +335,7 @@ smbfs_reclaim(ap) smbfs_hash_unlock(smp); if (np->n_name) smbfs_name_free(np->n_name); - FREE(np, M_SMBNODE); + free(np, M_SMBNODE); if (dvp != NULL) { vrele(dvp); /* diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index a811e00..9e1dc16 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -179,7 +179,7 @@ smbfs_mount(struct mount *mp, struct thread *td) #ifdef SMBFS_USEZONE smp = zalloc(smbfsmount_zone); #else - MALLOC(smp, struct smbmount*, sizeof(*smp), M_SMBFSDATA, + smp = malloc(sizeof(*smp), M_SMBFSDATA, M_WAITOK|M_USE_RESERVE); #endif if (smp == NULL) { diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 6c0d7d0..21ab167 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -331,7 +331,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) { bo = &devvp->v_bufobj; /* XXX: should be M_WAITOK */ - MALLOC(udfmp, struct udf_mnt *, sizeof(struct udf_mnt), M_UDFMOUNT, + udfmp = malloc(sizeof(struct udf_mnt), M_UDFMOUNT, M_NOWAIT | M_ZERO); if (udfmp == NULL) { printf("Cannot allocate UDF mount struct\n"); @@ -488,7 +488,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) { bail: if (udfmp != NULL) - FREE(udfmp, M_UDFMOUNT); + free(udfmp, M_UDFMOUNT); if (bp != NULL) brelse(bp); DROP_GIANT(); @@ -530,9 +530,9 @@ udf_unmount(struct mount *mp, int mntflags, struct thread *td) vrele(udfmp->im_devvp); if (udfmp->s_table != NULL) - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); - FREE(udfmp, M_UDFMOUNT); + free(udfmp, M_UDFMOUNT); mp->mnt_data = NULL; MNT_ILOCK(mp); @@ -647,7 +647,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) return (ENOMEM); } size = UDF_FENTRY_SIZE + le32toh(fe->l_ea) + le32toh(fe->l_ad); - MALLOC(unode->fentry, struct file_entry *, size, M_UDFFENTRY, + unode->fentry = malloc(size, M_UDFFENTRY, M_NOWAIT | M_ZERO); if (unode->fentry == NULL) { printf("Cannot allocate file entry block\n"); @@ -757,8 +757,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) pms = (struct part_map_spare *)pmap; pmap += UDF_PMAP_TYPE2_SIZE; - MALLOC(udfmp->s_table, struct udf_sparing_table *, - le32toh(pms->st_size), M_UDFMOUNT, M_NOWAIT | M_ZERO); + udfmp->s_table = malloc( le32toh(pms->st_size), M_UDFMOUNT, M_NOWAIT | M_ZERO); if (udfmp->s_table == NULL) return (ENOMEM); @@ -776,7 +775,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) brelse(bp); printf("Failed to read Sparing Table at sector %d\n", le32toh(pms->st_loc[0])); - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); return (error); } bcopy(bp->b_data, udfmp->s_table, le32toh(pms->st_size)); @@ -784,7 +783,7 @@ udf_find_partmaps(struct udf_mnt *udfmp, struct logvol_desc *lvd) if (udf_checktag(&udfmp->s_table->tag, 0)) { printf("Invalid sparing table found\n"); - FREE(udfmp->s_table, M_UDFMOUNT); + free(udfmp->s_table, M_UDFMOUNT); return (EINVAL); } diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index 26d5b18..d468890 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -574,7 +574,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); } fid = (struct fileid_desc*)&ds->data[ds->off]; @@ -599,7 +599,7 @@ udf_getfid(struct udf_dirstream *ds) * File ID descriptors can only be at most one * logical sector in size. */ - MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID, + ds->buf = malloc(ds->udfmp->bsize, M_UDFFID, M_WAITOK | M_ZERO); bcopy(fid, ds->buf, frag_size); @@ -668,7 +668,7 @@ udf_closedir(struct udf_dirstream *ds) brelse(ds->bp); if (ds->fid_fragment && ds->buf != NULL) - FREE(ds->buf, M_UDFFID); + free(ds->buf, M_UDFFID); uma_zfree(udf_zone_ds, ds); } @@ -701,7 +701,7 @@ udf_readdir(struct vop_readdir_args *a) * it left off. */ ncookies = uio->uio_resid / 8; - MALLOC(cookies, u_long *, sizeof(u_long) * ncookies, + cookies = malloc(sizeof(u_long) * ncookies, M_TEMP, M_WAITOK); if (cookies == NULL) return (ENOMEM); @@ -787,7 +787,7 @@ udf_readdir(struct vop_readdir_args *a) if (a->a_ncookies != NULL) { if (error) - FREE(cookies, M_TEMP); + free(cookies, M_TEMP); else { *a->a_ncookies = uiodir.acookies; *a->a_cookies = cookies; @@ -1028,7 +1028,7 @@ udf_reclaim(struct vop_reclaim_args *a) vfs_hash_remove(vp); if (unode->fentry != NULL) - FREE(unode->fentry, M_UDFFENTRY); + free(unode->fentry, M_UDFFENTRY); uma_zfree(udf_zone_node, unode); vp->v_data = NULL; } diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index cb9af5a..d4c1e60 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -257,17 +257,17 @@ unionfs_nodeget(struct mount *mp, struct vnode *uppervp, * might cause a bogus v_data pointer to get dereferenced elsewhere * if MALLOC should block. */ - MALLOC(unp, struct unionfs_node *, sizeof(struct unionfs_node), + unp = malloc(sizeof(struct unionfs_node), M_UNIONFSNODE, M_WAITOK | M_ZERO); error = getnewvnode("unionfs", mp, &unionfs_vnodeops, &vp); if (error != 0) { - FREE(unp, M_UNIONFSNODE); + free(unp, M_UNIONFSNODE); return (error); } error = insmntque(vp, mp); /* XXX: Too early for mpsafe fs */ if (error != 0) { - FREE(unp, M_UNIONFSNODE); + free(unp, M_UNIONFSNODE); return (error); } if (dvp != NULLVP) @@ -415,7 +415,7 @@ unionfs_noderem(struct vnode *vp, struct thread *td) LIST_REMOVE(unsp, uns_list); free(unsp, M_TEMP); } - FREE(unp, M_UNIONFSNODE); + free(unp, M_UNIONFSNODE); } /* @@ -440,8 +440,7 @@ unionfs_get_node_status(struct unionfs_node *unp, struct thread *td, } /* create a new unionfs node status */ - MALLOC(unsp, struct unionfs_node_status *, - sizeof(struct unionfs_node_status), M_TEMP, M_WAITOK | M_ZERO); + unsp = malloc( sizeof(struct unionfs_node_status), M_TEMP, M_WAITOK | M_ZERO); unsp->uns_pid = pid; LIST_INSERT_HEAD(&(unp->un_unshead), unsp, uns_list); |
