Back out M_* changes, per decision of the TRB.

Approved by: trb

2 files changed, 4 insertions, 4 deletions

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++;