diff options
author | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
commit | a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch) | |
tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/kern/vfs_export.c | |
parent | 8f3e32c2b6b9f392e096f096653596f55f2134ae (diff) | |
download | src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.tar.gz src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.zip |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Notes
Notes:
svn path=/head/; revision=111119
Diffstat (limited to 'sys/kern/vfs_export.c')
-rw-r--r-- | sys/kern/vfs_export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 80158a34f1e2..b909b8304246 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -122,7 +122,7 @@ vfs_hang_addrlist(mp, nep, argp) return (EINVAL); i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; - np = (struct netcred *) malloc(i, M_NETADDR, M_ZERO); + np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); if ((error = copyin(argp->ex_addr, saddr, argp->ex_addrlen))) goto out; @@ -236,7 +236,7 @@ vfs_export(mp, argp) } if (argp->ex_flags & MNT_EXPORTED) { if (nep == NULL) { - nep = malloc(sizeof(struct netexport), M_MOUNT, M_ZERO); + nep = malloc(sizeof(struct netexport), M_MOUNT, M_WAITOK | M_ZERO); mp->mnt_export = nep; } if (argp->ex_flags & MNT_EXPUBLIC) { @@ -306,7 +306,7 @@ vfs_setpublicfs(mp, nep, argp) */ if (argp->ex_indexfile != NULL) { MALLOC(nfs_pub.np_index, char *, MAXNAMLEN + 1, M_TEMP, - 0); + M_WAITOK); error = copyinstr(argp->ex_indexfile, nfs_pub.np_index, MAXNAMLEN, (size_t *)0); if (!error) { |