diff options
author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/fs/smbfs/smbfs_node.c | |
parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/fs/smbfs/smbfs_node.c')
-rw-r--r-- | sys/fs/smbfs/smbfs_node.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |