diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/fs/smbfs/smbfs_node.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
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 093e7ca4..f4c3c03 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, M_WAITOK); + cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, 0); *(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, M_WAITOK); + cp = malloc(nmlen, M_SMBNODENAME, 0); 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, M_WAITOK); + MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, 0); error = getnewvnode("smbfs", mp, smbfs_vnodeop_p, &vp); if (error) { FREE(np, M_SMBNODE); |
