summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c4
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c8
-rw-r--r--sys/fs/coda/cnode.h2
-rw-r--r--sys/fs/devfs/devfs_devs.c10
-rw-r--r--sys/fs/devfs/devfs_rule.c6
-rw-r--r--sys/fs/devfs/devfs_vfsops.c4
-rw-r--r--sys/fs/devfs/devfs_vnops.c4
-rw-r--r--sys/fs/fdescfs/fdesc_vfsops.c2
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c2
-rw-r--r--sys/fs/hpfs/hpfs_subr.c6
-rw-r--r--sys/fs/hpfs/hpfs_vfsops.c4
-rw-r--r--sys/fs/hpfs/hpfs_vnops.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c2
-rw-r--r--sys/fs/ntfs/ntfs_subr.c38
-rw-r--r--sys/fs/ntfs/ntfs_vfsops.c6
-rw-r--r--sys/fs/ntfs/ntfs_vnops.c2
-rw-r--r--sys/fs/nullfs/null_subr.c2
-rw-r--r--sys/fs/nullfs/null_vfsops.c2
-rw-r--r--sys/fs/nwfs/nwfs_node.c2
-rw-r--r--sys/fs/nwfs/nwfs_vfsops.c2
-rw-r--r--sys/fs/portalfs/portal_vfsops.c4
-rw-r--r--sys/fs/portalfs/portal_vnops.c4
-rw-r--r--sys/fs/pseudofs/pseudofs.c10
-rw-r--r--sys/fs/pseudofs/pseudofs_fileno.c4
-rw-r--r--sys/fs/pseudofs/pseudofs_vncache.c2
-rw-r--r--sys/fs/smbfs/smbfs_node.c6
-rw-r--r--sys/fs/smbfs/smbfs_smb.c6
-rw-r--r--sys/fs/udf/udf_vfsops.c2
-rw-r--r--sys/fs/udf/udf_vnops.c10
-rw-r--r--sys/fs/umapfs/umap_subr.c2
-rw-r--r--sys/fs/umapfs/umap_vfsops.c2
-rw-r--r--sys/fs/unionfs/union_subr.c14
-rw-r--r--sys/fs/unionfs/union_vfsops.c2
36 files changed, 93 insertions, 93 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index f916117..a44df4c 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -411,7 +411,7 @@ iso_mountfs(devvp, mp, td, argp)
pri_sierra->root_directory_record:
pri->root_directory_record);
- isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_ZERO);
+ isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK | M_ZERO);
isomp->logical_block_size = logical_block_size;
isomp->volume_space_size =
isonum_733 (high_sierra?
@@ -712,7 +712,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
return (error);
}
MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
- M_ZERO);
+ M_WAITOK | M_ZERO);
vp->v_data = ip;
ip->i_vnode = vp;
ip->i_dev = dev;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 062c22a..0b892e6 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -194,7 +194,7 @@ cd9660_getattr(ap)
struct uio auio;
char *cp;
- MALLOC(cp, char *, MAXPATHLEN, M_TEMP, 0);
+ MALLOC(cp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
aiov.iov_base = cp;
aiov.iov_len = MAXPATHLEN;
auio.uio_iov = &aiov;
@@ -451,7 +451,7 @@ cd9660_readdir(ap)
imp = dp->i_mnt;
bmask = imp->im_bmask;
- MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, 0);
+ MALLOC(idp, struct isoreaddir *, sizeof(*idp), M_TEMP, M_WAITOK);
idp->saveent.d_namlen = idp->assocent.d_namlen = 0;
/*
* XXX
@@ -468,7 +468,7 @@ cd9660_readdir(ap)
*/
ncookies = uio->uio_resid / 16;
MALLOC(cookies, u_long *, ncookies * sizeof(u_int), M_TEMP,
- 0);
+ M_WAITOK);
idp->cookies = cookies;
idp->ncookies = ncookies;
}
@@ -671,7 +671,7 @@ cd9660_readlink(ap)
if (uio->uio_segflg == UIO_SYSSPACE)
symname = uio->uio_iov->iov_base;
else
- symname = uma_zalloc(namei_zone, 0);
+ symname = uma_zalloc(namei_zone, M_WAITOK);
/*
* Ok, we just gathering a symbolic name in SL record.
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 8d0cebe..962d329 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -66,7 +66,7 @@ MALLOC_DECLARE(M_CODA);
#define CODA_ALLOC(ptr, cast, size) \
do { \
- ptr = (cast)malloc((unsigned long) size, M_CODA, 0); \
+ ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK); \
if (ptr == 0) { \
panic("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
} \
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 75ef573..95f2e2e 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -152,11 +152,11 @@ devfs_attemptoverflow(int insist)
or = NULL;
n = devfs_noverflowwant;
nb = sizeof (dev_t *) * n;
- MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
+ MALLOC(ot, dev_t **, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
if (ot == NULL)
goto bail;
nb = sizeof (int) * n;
- MALLOC(or, int *, nb, M_DEVFS, (insist ? 0 : M_NOWAIT) | M_ZERO);
+ MALLOC(or, int *, nb, M_DEVFS, (insist ? M_WAITOK : M_NOWAIT) | M_ZERO);
if (or == NULL)
goto bail;
if (!atomic_cmpset_ptr(&devfs_overflow, NULL, ot))
@@ -199,7 +199,7 @@ devfs_newdirent(char *name, int namelen)
d.d_namlen = namelen;
i = sizeof (*de) + GENERIC_DIRSIZ(&d);
- MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_ZERO);
+ MALLOC(de, struct devfs_dirent *, i, M_DEVFS, M_WAITOK | M_ZERO);
de->de_dirent = (struct dirent *)(de + 1);
de->de_dirent->d_namlen = namelen;
de->de_dirent->d_reclen = GENERIC_DIRSIZ(&d);
@@ -294,7 +294,7 @@ devfs_populate(struct devfs_mount *dm)
if (devfs_noverflow && dm->dm_overflow == NULL) {
i = devfs_noverflow * sizeof (struct devfs_dirent *);
MALLOC(dm->dm_overflow, struct devfs_dirent **, i,
- M_DEVFS, M_ZERO);
+ M_DEVFS, M_WAITOK | M_ZERO);
}
while (dm->dm_generation != devfs_generation) {
dm->dm_generation = devfs_generation;
@@ -352,7 +352,7 @@ devfs_populate(struct devfs_mount *dm)
de->de_dirent->d_type = DT_LNK;
pdev = dev->si_parent;
j = strlen(pdev->si_name) + 1;
- MALLOC(de->de_symlink, char *, j, M_DEVFS, 0);
+ MALLOC(de->de_symlink, char *, j, M_DEVFS, M_WAITOK);
bcopy(pdev->si_name, de->de_symlink, j);
} else {
de->de_inode = i;
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index 1da7019..e680202 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -222,7 +222,7 @@ devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td)
error = ESRCH;
goto out;
}
- dk = malloc(sizeof(*dk), M_TEMP, M_ZERO);
+ dk = malloc(sizeof(*dk), M_TEMP, M_WAITOK | M_ZERO);
memcpy(&dk->dk_rule, dr, sizeof(*dr));
lockmgr(&dm->dm_lock, LK_UPGRADE, 0, td);
devfs_rule_applydm(dk, dm);
@@ -556,7 +556,7 @@ devfs_rule_insert(struct devfs_rule *dr)
return (error);
}
- dk = malloc(sizeof(*dk), M_DEVFS, 0);
+ dk = malloc(sizeof(*dk), M_DEVFS, M_WAITOK);
dk->dk_ruleset = ds;
if (dsi != NULL)
++dsi->ds_refcount;
@@ -749,7 +749,7 @@ devfs_ruleset_create(devfs_rsnum rsnum)
KASSERT(devfs_ruleset_bynum(rsnum) == NULL,
("creating already existent ruleset %d", rsnum));
- ds = malloc(sizeof(*ds), M_DEVFS, M_ZERO);
+ ds = malloc(sizeof(*ds), M_DEVFS, M_WAITOK | M_ZERO);
ds->ds_number = rsnum;
ds->ds_refcount = ds->ds_flags = 0;
SLIST_INIT(&ds->ds_rules);
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 26b0deb..64d4cde 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -77,10 +77,10 @@ devfs_nmount(mp, ndp, td)
return (EOPNOTSUPP);
MALLOC(fmp, struct devfs_mount *, sizeof(struct devfs_mount),
- M_DEVFS, M_ZERO);
+ M_DEVFS, M_WAITOK | M_ZERO);
MALLOC(fmp->dm_dirent, struct devfs_dirent **,
sizeof(struct devfs_dirent *) * NDEVFSINO,
- M_DEVFS, M_ZERO);
+ M_DEVFS, M_WAITOK | M_ZERO);
lockinit(&fmp->dm_lock, PVFS, "devfs", 0, LK_NOPAUSE);
mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index db6e475..6b6683a 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -607,7 +607,7 @@ devfs_readdir(ap)
}
if( !error && ap->a_ncookies != NULL && ap->a_cookies != NULL ) {
MALLOC(cookiebuf, u_long *, ncookies * sizeof(u_long),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
cookiep = cookiebuf;
dps = (struct dirent *)((char *)uio->uio_iov->iov_base -
(uio->uio_offset - oldoff));
@@ -858,7 +858,7 @@ devfs_symlink(ap)
de->de_inode = dmp->dm_inode++;
de->de_dirent->d_type = DT_LNK;
i = strlen(ap->a_target) + 1;
- MALLOC(de->de_symlink, char *, i, M_DEVFS, 0);
+ MALLOC(de->de_symlink, char *, i, M_DEVFS, M_WAITOK);
bcopy(ap->a_target, de->de_symlink, i);
lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread);
#ifdef MAC
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 18bff45..a4741bc 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -89,7 +89,7 @@ fdesc_mount(mp, ndp, td)
return (error);
MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount),
- M_FDESCMNT, 0); /* XXX */
+ M_FDESCMNT, M_WAITOK); /* XXX */
rvp->v_type = VDIR;
rvp->v_vflag |= VV_ROOT;
fmp->f_root = rvp;
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 467066b..2225220 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -132,7 +132,7 @@ loop:
* might cause a bogus v_data pointer to get dereferenced
* elsewhere if MALLOC should block.
*/
- MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, 0);
+ MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK);
error = getnewvnode("fdesc", mp, fdesc_vnodeop_p, vpp);
if (error) {
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index bb58afb..64fee38 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -174,7 +174,7 @@ fifo_open(ap)
int error;
if ((fip = vp->v_fifoinfo) == NULL) {
- MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, 0);
+ MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
vp->v_fifoinfo = fip;
error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0,
ap->a_td->td_ucred, ap->a_td);
diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index 6d020cd..b45ebbd 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -110,10 +110,10 @@ hpfs_bminit(
dprintf(("0x%lx data bands, ", hpmp->hpm_dbnum));
MALLOC(hpmp->hpm_bmind, lsn_t *, hpmp->hpm_dbnum * sizeof(lsn_t),
- M_HPFSMNT, 0);
+ M_HPFSMNT, M_WAITOK);
MALLOC(hpmp->hpm_bitmap, u_int8_t *, hpmp->hpm_dbnum * BMSIZE,
- M_HPFSMNT, 0);
+ M_HPFSMNT, M_WAITOK);
error = bread(hpmp->hpm_devvp, hpmp->hpm_su.su_bitmap.lsn1,
((hpmp->hpm_dbnum + 0x7F) & ~(0x7F)) << 2, NOCRED, &bp);
@@ -273,7 +273,7 @@ hpfs_cpinit (
cpicnt = hpmp->hpm_sp.sp_cpinum;
MALLOC(hpmp->hpm_cpdblk, struct cpdblk *,
- cpicnt * sizeof(struct cpdblk), M_HPFSMNT, 0);
+ cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK);
cpdbp = hpmp->hpm_cpdblk;
lsn = hpmp->hpm_sp.sp_cpi;
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 7244936..1242e84 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -252,7 +252,7 @@ hpfs_mountfs(devvp, mp, argsp, td)
/*
* Do actual mount
*/
- hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_ZERO);
+ hpmp = malloc(sizeof(struct hpfsmount), M_HPFSMNT, M_WAITOK | M_ZERO);
/* Read in SuperBlock */
error = bread(devvp, SUBLOCK, SUSIZE, NOCRED, &bp);
@@ -494,7 +494,7 @@ hpfs_vget(
* check for it).
*/
MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode),
- M_HPFSNO, 0);
+ M_HPFSNO, M_WAITOK);
error = getnewvnode("hpfs", hpmp->hpm_mp, hpfs_vnodeop_p, &vp);
if (error) {
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 6578095..fe9d36a 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -1005,7 +1005,7 @@ readdone:
((caddr_t)uio->uio_iov->iov_base -
(uio->uio_offset - off));
MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
for (dp = dpStart, cookiep = cookies, i=0;
i < ncookies;
dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index a0da2c7..735e7df 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -246,7 +246,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, 0);
+ MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK);
/*
* Directory entry was not in cache, have to create a vnode and
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 82b8043..b6ea514 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -349,7 +349,7 @@ mountmsdosfs(devvp, mp, td, argp)
}
#endif
- pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_ZERO);
+ pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK | M_ZERO);
pmp->pm_mountp = mp;
/*
@@ -560,7 +560,7 @@ mountmsdosfs(devvp, mp, td, argp)
pmp->pm_inusemap = malloc(((pmp->pm_maxcluster + N_INUSEBITS - 1)
/ N_INUSEBITS)
* sizeof(*pmp->pm_inusemap),
- M_MSDOSFSFAT, 0);
+ M_MSDOSFSFAT, M_WAITOK);
/*
* fillinusemap() needs pm_devvp.
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index d368775..c92c83a 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1501,7 +1501,7 @@ msdosfs_readdir(ap)
if (ap->a_ncookies) {
ncookies = uio->uio_resid / 16;
MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
- 0);
+ 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 919fcff..20b98a5 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -187,7 +187,7 @@ ntfs_ntvattrget(
}
/* Scan $ATTRIBUTE_LIST for requested attribute */
len = lvap->va_datalen;
- MALLOC(alpool, caddr_t, len, M_TEMP, 0);
+ MALLOC(alpool, caddr_t, len, M_TEMP, M_WAITOK);
error = ntfs_readntvattr_plain(ntmp, ip, lvap, 0, len, alpool, &len,
NULL);
if (error)
@@ -266,7 +266,7 @@ ntfs_loadntnode(
dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number));
MALLOC(mfrp, struct filerec *, ntfs_bntob(ntmp->ntm_bpmftrec),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
if (ip->i_number < NTFS_SYSNODESNUM) {
struct buf *bp;
@@ -390,7 +390,7 @@ ntfs_ntlookup(
NULL));
MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE,
- M_ZERO);
+ M_WAITOK | M_ZERO);
ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip));
/* Generic initialization */
@@ -539,7 +539,7 @@ ntfs_attrtontvattr(
*rvapp = NULL;
MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr),
- M_NTFSNTVATTR, M_ZERO);
+ M_NTFSNTVATTR, M_WAITOK | M_ZERO);
vap->va_ip = NULL;
vap->va_flag = rap->a_hdr.a_flag;
vap->va_type = rap->a_hdr.a_type;
@@ -576,7 +576,7 @@ ntfs_attrtontvattr(
vap->va_vcnstart = 0;
vap->va_vcnend = ntfs_btocn(vap->va_allocated);
MALLOC(vap->va_datap, caddr_t, vap->va_datalen,
- M_NTFSRDATA, 0);
+ M_NTFSRDATA, M_WAITOK);
memcpy(vap->va_datap, (caddr_t) rap + rap->a_r.a_dataoff,
rap->a_r.a_datalen);
}
@@ -617,8 +617,8 @@ ntfs_runtovrun(
off += (run[off] & 0xF) + ((run[off] >> 4) & 0xF) + 1;
cnt++;
}
- MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
- MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, 0);
+ MALLOC(cn, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
+ MALLOC(cl, cn_t *, cnt * sizeof(cn_t), M_NTFSRUN, M_WAITOK);
off = 0;
cnt = 0;
@@ -738,13 +738,13 @@ ntfs_fget(
return (0);
MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE,
- M_ZERO);
+ 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, 0);
+ MALLOC(fp->f_attrname, char *, strlen(attrname)+1, M_TEMP, M_WAITOK);
strcpy(fp->f_attrname, attrname);
} else
fp->f_attrname = NULL;
@@ -829,7 +829,7 @@ ntfs_ntlookupattr(
out:
if (namelen) {
- MALLOC((*attrname), char *, namelen, M_TEMP, 0);
+ MALLOC((*attrname), char *, namelen, M_TEMP, M_WAITOK);
memcpy((*attrname), name, namelen);
(*attrname)[namelen] = '\0';
}
@@ -894,7 +894,7 @@ ntfs_ntlookupfile(
dprintf(("ntfs_ntlookupfile: blksz: %d, rdsz: %d\n", blsize, rdsize));
- MALLOC(rdbuf, caddr_t, blsize, M_TEMP, 0);
+ MALLOC(rdbuf, caddr_t, blsize, M_TEMP, M_WAITOK);
error = ntfs_readattr(ntmp, ip, NTFS_A_INDXROOT, "$I30",
0, rdsize, rdbuf, NULL);
@@ -1112,7 +1112,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, 0);
+ max(vap->va_datalen,fp->f_dirblsz), M_NTFSDIR, M_WAITOK);
}
blsize = fp->f_dirblsz;
@@ -1127,7 +1127,7 @@ ntfs_ntreaddir(
error = ENOTDIR;
goto fail;
}
- MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, 0);
+ MALLOC(bmp, u_char *, bmvap->va_datalen, M_TEMP, M_WAITOK);
error = ntfs_readattr(ntmp, ip, NTFS_A_INDXBITMAP, "$I30", 0,
bmvap->va_datalen, bmp, NULL);
if (error)
@@ -1708,9 +1708,9 @@ ntfs_readattr(
vap->va_compressalg));
MALLOC(cup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
- M_NTFSDECOMP, 0);
+ M_NTFSDECOMP, M_WAITOK);
MALLOC(uup, u_int8_t *, ntfs_cntob(NTFS_COMPUNIT_CL),
- M_NTFSDECOMP, 0);
+ M_NTFSDECOMP, M_WAITOK);
cn = (ntfs_btocn(roff)) & (~(NTFS_COMPUNIT_CL - 1));
off = roff - ntfs_cntob(cn);
@@ -1943,7 +1943,7 @@ ntfs_toupper_use(mp, ntmp)
* so don't bother reading more
*/
MALLOC(ntfs_toupper_tab, wchar *, 65536 * sizeof(wchar),
- M_NTFSRDATA, 0);
+ M_NTFSRDATA, M_WAITOK);
if ((error = VFS_VGET(mp, NTFS_UPCASEINO, LK_EXCLUSIVE, &vp)))
goto out;
@@ -1991,14 +1991,14 @@ ntfs_u28_init(
char ** u28;
int i, j, h, l;
- MALLOC(u28, char **, 256 * sizeof(char*), M_TEMP, M_ZERO);
+ MALLOC(u28, char **, 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, 0);
+ MALLOC(u28[h], char *, 256 * sizeof(char), M_TEMP, M_WAITOK);
for (j=0; j<256; j++)
u28[h][j] = '_';
}
@@ -2039,7 +2039,7 @@ ntfs_82u_init(
wchar * _82u;
int i;
- MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, 0);
+ MALLOC(_82u, wchar *, 256 * sizeof(wchar), M_TEMP, M_WAITOK);
if (u2w == NULL) {
for (i=0; i<256; i++)
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 7221e0b..1e267a9 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -309,7 +309,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
if (error)
goto out;
- ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_ZERO);
+ ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) );
brelse( bp );
bp = NULL;
@@ -415,7 +415,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
/* Alloc memory for attribute definitions */
MALLOC(ntmp->ntm_ad, struct ntvattrdef *,
num * sizeof(struct ntvattrdef),
- M_NTFSMNT, 0);
+ M_NTFSMNT, M_WAITOK);
ntmp->ntm_adnum = num;
@@ -562,7 +562,7 @@ ntfs_calccfree(
bmsize = VTOF(vp)->f_size;
- MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, 0);
+ MALLOC(tmp, u_int8_t *, bmsize, M_TEMP, M_WAITOK);
error = ntfs_readattr(ntmp, VTONT(vp), NTFS_A_DATA, NULL,
0, bmsize, tmp, NULL);
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index b39f0cb..90ca4f1 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -590,7 +590,7 @@ ntfs_readdir(ap)
((caddr_t)uio->uio_iov->iov_base -
(uio->uio_offset - off));
MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
for (dp = dpStart, cookiep = cookies, i=0;
i < ncookies;
dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 0285add..f2a43e0 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -212,7 +212,7 @@ null_nodeget(mp, lowervp, vpp)
* elsewhere if MALLOC should block.
*/
MALLOC(xp, struct null_node *, sizeof(struct null_node),
- M_NULLFSNODE, 0);
+ M_NULLFSNODE, M_WAITOK);
error = getnewvnode("null", mp, null_vnodeop_p, &vp);
if (error) {
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 20b1877..d6ca211 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -158,7 +158,7 @@ nullfs_mount(mp, ndp, td)
}
xmp = (struct null_mount *) malloc(sizeof(struct null_mount),
- M_NULLFSMNT, 0); /* XXX */
+ M_NULLFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index d8bdbc4..b92dd4c 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -169,7 +169,7 @@ 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_ZERO);
+ MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO);
error = getnewvnode("nwfs", mp, nwfs_vnodeop_p, &vp);
if (error) {
*vpp = NULL;
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index c033b11..f097b3e 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -125,7 +125,7 @@ nwfs_initnls(struct nwmount *nmp) {
nmp->m.nls.u2n = ncp_defnls.u2n;
return 0;
}
- MALLOC(pe, char *, 256 * 4, M_NWFSDATA, 0);
+ MALLOC(pe, char *, 256 * 4, M_NWFSDATA, M_WAITOK);
pc = pe;
do {
COPY_TABLE(nmp->m.nls.to_lower, ncp_defnls.to_lower);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 4c8c3f9..66e516d 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -113,10 +113,10 @@ portal_mount(mp, path, data, ndp, td)
}
MALLOC(pn, struct portalnode *, sizeof(struct portalnode),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
MALLOC(fmp, struct portalmount *, sizeof(struct portalmount),
- M_PORTALFSMNT, 0); /* XXX */
+ M_PORTALFSMNT, M_WAITOK); /* XXX */
error = getnewvnode("portal", mp, portal_vnodeop_p, &rvp); /* XXX */
if (error) {
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index f272e14..0d8c06d 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -132,7 +132,7 @@ portal_lookup(ap)
* elsewhere if MALLOC should block.
*/
MALLOC(pt, struct portalnode *, sizeof(struct portalnode),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
error = getnewvnode("portal", dvp->v_mount, portal_vnodeop_p, &fvp);
if (error) {
@@ -150,7 +150,7 @@ portal_lookup(ap)
size++;
cnp->cn_consume = size - cnp->cn_namelen;
- pt->pt_arg = malloc(size+1, M_TEMP, 0);
+ pt->pt_arg = malloc(size+1, M_TEMP, M_WAITOK);
pt->pt_size = size+1;
bcopy(pname, pt->pt_arg, pt->pt_size);
pt->pt_fileid = portal_fileid++;
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index 67b3fae..8297ef6 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -92,7 +92,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
struct pfs_node *dir;
MALLOC(dir, struct pfs_node *, sizeof *dir,
- M_PFSNODES, M_ZERO);
+ M_PFSNODES, M_WAITOK|M_ZERO);
dir->pn_name[0] = '.';
dir->pn_type = pfstype_this;
@@ -102,7 +102,7 @@ _pfs_fixup_dir(struct pfs_node *parent)
}
MALLOC(dir, struct pfs_node *, sizeof *dir,
- M_PFSNODES, M_ZERO);
+ M_PFSNODES, M_WAITOK|M_ZERO);
dir->pn_name[0] = dir->pn_name[1] = '.';
dir->pn_type = pfstype_parent;
@@ -127,7 +127,7 @@ pfs_create_dir(struct pfs_node *parent, char *name,
("%s(): node name is too long", __func__));
MALLOC(dir, struct pfs_node *, sizeof *dir,
- M_PFSNODES, M_ZERO);
+ M_PFSNODES, M_WAITOK|M_ZERO);
strcpy(dir->pn_name, name);
dir->pn_type = (flags & PFS_PROCDEP) ? pfstype_procdir : pfstype_dir;
dir->pn_attr = attr;
@@ -160,7 +160,7 @@ pfs_create_file(struct pfs_node *parent, char *name, pfs_fill_t fill,
("%s(): node name is too long", __func__));
MALLOC(node, struct pfs_node *, sizeof *node,
- M_PFSNODES, M_ZERO);
+ M_PFSNODES, M_WAITOK|M_ZERO);
strcpy(node->pn_name, name);
node->pn_type = pfstype_file;
node->pn_func = fill;
@@ -320,7 +320,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc)
/* set up the root diretory */
MALLOC(root, struct pfs_node *, sizeof *root,
- M_PFSNODES, M_ZERO);
+ M_PFSNODES, M_WAITOK|M_ZERO);
root->pn_type = pfstype_root;
root->pn_name[0] = '/';
root->pn_info = pi;
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index 0ca1640..4341e23 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -82,7 +82,7 @@ pfs_fileno_init(struct pfs_info *pi)
struct pfs_bitmap *pb;
MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
- M_PFSFILENO, M_ZERO);
+ M_PFSFILENO, M_WAITOK|M_ZERO);
mtx_lock(&pi->pi_mutex);
@@ -144,7 +144,7 @@ pfs_get_fileno(struct pfs_info *pi)
if (pb == NULL) {
mtx_unlock(&pi->pi_mutex);
MALLOC(pb, struct pfs_bitmap *, sizeof *pb,
- M_PFSFILENO, M_ZERO);
+ M_PFSFILENO, M_WAITOK|M_ZERO);
mtx_lock(&pi->pi_mutex);
/* protect against possible race */
while (ppb->pb_next)
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index eed7aef..c832925 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -133,7 +133,7 @@ pfs_vncache_alloc(struct mount *mp, struct vnode **vpp,
++pfs_vncache_misses;
/* nope, get a new one */
- MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, 0);
+ MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK);
if (++pfs_vncache_entries > pfs_vncache_maxentries)
pfs_vncache_maxentries = pfs_vncache_entries;
error = getnewvnode("pseudofs", mp, pfs_vnodeop_p, vpp);
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index f4c3c03..093e7ca4 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -114,7 +114,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
nmlen++;
#ifdef SMBFS_NAME_DEBUG
- cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, 0);
+ cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, M_WAITOK);
*(int*)cp = nmlen;
cp += sizeof(int);
cp[0] = 0xfc;
@@ -122,7 +122,7 @@ smbfs_name_alloc(const u_char *name, int nmlen)
bcopy(name, cp, nmlen - 1);
cp[nmlen] = 0xfe;
#else
- cp = malloc(nmlen, M_SMBNODENAME, 0);
+ cp = malloc(nmlen, M_SMBNODENAME, M_WAITOK);
bcopy(name, cp, nmlen - 1);
#endif
cp[nmlen - 1] = 0;
@@ -219,7 +219,7 @@ loop:
if (fap == NULL)
return ENOENT;
- MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, 0);
+ MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK);
error = getnewvnode("smbfs", mp, smbfs_vnodeop_p, &vp);
if (error) {
FREE(np, M_SMBNODE);
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index 59a5691..034fc77 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -1264,7 +1264,7 @@ static int
smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
const char *wildcard, int wclen, int attr, struct smb_cred *scred)
{
- ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, 0);
+ ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
if (ctx->f_name == NULL)
return ENOMEM;
ctx->f_infolevel = SMB_DIALECT(SSTOVC(ctx->f_ssp)) < SMB_DIALECT_NTLM0_12 ?
@@ -1371,7 +1371,7 @@ smbfs_findnextLM2(struct smbfs_fctx *ctx, int limit)
if (ctx->f_rnamelen <= nmlen) {
if (ctx->f_rname)
free(ctx->f_rname, M_SMBFSDATA);
- ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, 0);
+ ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, M_WAITOK);
ctx->f_rnamelen = nmlen;
}
bcopy(ctx->f_name, ctx->f_rname, nmlen);
@@ -1404,7 +1404,7 @@ smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen, int attr,
struct smbfs_fctx *ctx;
int error;
- ctx = malloc(sizeof(*ctx), M_SMBFSDATA, 0);
+ ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK);
if (ctx == NULL)
return ENOMEM;
bzero(ctx, sizeof(*ctx));
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 2e7df0a..b41b86b 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -562,7 +562,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
* Allocate memory and check the tag id's before grabbing a new
* vnode, since it's hard to roll back if there is a problem.
*/
- unode = uma_zalloc(udf_zone_node, 0);
+ unode = uma_zalloc(udf_zone_node, M_WAITOK);
if (unode == NULL) {
printf("Cannot allocate udf node\n");
return (ENOMEM);
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index f6d5fd2..8d9be57 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -449,7 +449,7 @@ udf_transname(char *cs0string, char *destname, int len)
int i, unilen = 0;
/* allocate a buffer big enough to hold an 8->16 bit expansion */
- transname = uma_zalloc(udf_zone_trans, 0);
+ transname = uma_zalloc(udf_zone_trans, M_WAITOK);
if ((unilen = udf_UncompressUnicode(len, cs0string, transname)) == -1) {
printf("udf: Unicode translation failed\n");
@@ -486,7 +486,7 @@ udf_cmpname(char *cs0string, char *cmpname, int cs0len, int cmplen)
int error = 0;
/* This is overkill, but not worth creating a new zone */
- transname = uma_zalloc(udf_zone_trans, 0);
+ transname = uma_zalloc(udf_zone_trans, M_WAITOK);
cs0len = udf_transname(cs0string, transname, cs0len);
@@ -532,7 +532,7 @@ udf_opendir(struct udf_node *node, int offset, int fsize, struct udf_mnt *udfmp)
{
struct udf_dirstream *ds;
- ds = uma_zalloc(udf_zone_ds, M_ZERO);
+ ds = uma_zalloc(udf_zone_ds, M_WAITOK | M_ZERO);
ds->node = node;
ds->offset = offset;
@@ -597,7 +597,7 @@ udf_getfid(struct udf_dirstream *ds)
* logical sector in size.
*/
MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID,
- M_ZERO);
+ M_WAITOK | M_ZERO);
bcopy(fid, ds->buf, frag_size);
/* Reduce all of the casting magic */
@@ -697,7 +697,7 @@ udf_readdir(struct vop_readdir_args *a)
*/
ncookies = uio->uio_resid / 8;
MALLOC(cookies, u_long *, sizeof(u_long) * ncookies,
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
if (cookies == NULL)
return (ENOMEM);
uiodir.ncookies = ncookies;
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index e33adb6..d3fed34 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -210,7 +210,7 @@ umap_node_alloc(mp, lowervp, vpp)
* elsewhere if MALLOC should block.
*/
MALLOC(xp, struct umap_node *, sizeof(struct umap_node),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
error = getnewvnode("umap", mp, umap_vnodeop_p, vpp);
if (error) {
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index b148c73..c1ed751 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -155,7 +155,7 @@ umapfs_mount(mp, path, data, ndp, td)
#endif
amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
- M_UMAPFSMNT, 0); /* XXX */
+ M_UMAPFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index b645265..e08b70a 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -509,7 +509,7 @@ loop:
union_newlower(un, lowervp);
if (cnp && (lowervp != NULLVP)) {
un->un_path = malloc(cnp->cn_namelen+1,
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
bcopy(cnp->cn_nameptr, un->un_path,
cnp->cn_namelen);
un->un_path[cnp->cn_namelen] = '\0';
@@ -564,7 +564,7 @@ loop:
}
MALLOC((*vpp)->v_data, void *, sizeof(struct union_node),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
ASSERT_VOP_LOCKED(*vpp, "union_allocvp");
(*vpp)->v_vflag |= vflag;
@@ -591,7 +591,7 @@ loop:
un->un_openl = 0;
if (cnp && (lowervp != NULLVP)) {
- un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, 0);
+ un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, M_WAITOK);
bcopy(cnp->cn_nameptr, un->un_path, cnp->cn_namelen);
un->un_path[cnp->cn_namelen] = '\0';
} else {
@@ -686,7 +686,7 @@ union_copyfile(fvp, tvp, cred, td)
VOP_LEASE(fvp, td, cred, LEASE_READ);
VOP_LEASE(tvp, td, cred, LEASE_WRITE);
- buf = malloc(MAXBSIZE, M_TEMP, 0);
+ buf = malloc(MAXBSIZE, M_TEMP, M_WAITOK);
/* ugly loop follows... */
do {
@@ -858,7 +858,7 @@ union_relookup(um, dvp, vpp, cnp, cn, path, pathlen)
* Conclusion: Horrible.
*/
cn->cn_namelen = pathlen;
- cn->cn_pnbuf = uma_zalloc(namei_zone, 0);
+ cn->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
bcopy(path, cn->cn_pnbuf, cn->cn_namelen);
cn->cn_pnbuf[cn->cn_namelen] = '\0';
@@ -1068,7 +1068,7 @@ union_vn_create(vpp, un, td)
* copied in the first place).
*/
cn.cn_namelen = strlen(un->un_path);
- cn.cn_pnbuf = uma_zalloc(namei_zone, 0);
+ cn.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
bcopy(un->un_path, cn.cn_pnbuf, cn.cn_namelen+1);
cn.cn_nameiop = CREATE;
cn.cn_flags = (LOCKPARENT|LOCKLEAF|HASBUF|SAVENAME|ISLASTCN);
@@ -1260,7 +1260,7 @@ union_dircache(vp, td)
union_dircache_r(vp, 0, &cnt);
cnt++;
dircache = malloc(cnt * sizeof(struct vnode *),
- M_TEMP, 0);
+ M_TEMP, M_WAITOK);
vpp = dircache;
union_dircache_r(vp, &vpp, &cnt);
*vpp = NULLVP;
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 505c5da..637b350 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -194,7 +194,7 @@ union_mount(mp, ndp, td)
*/
um = (struct union_mount *) malloc(sizeof(struct union_mount),
- M_UNIONFSMNT, M_ZERO);
+ M_UNIONFSMNT, M_WAITOK | M_ZERO);
um->um_op = op;
OpenPOWER on IntegriCloud