summaryrefslogtreecommitdiffstats
path: root/sys/fs/smbfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/smbfs')
-rw-r--r--sys/fs/smbfs/smbfs_node.c6
-rw-r--r--sys/fs/smbfs/smbfs_smb.c6
2 files changed, 6 insertions, 6 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);
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index 034fc77..59a5691 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, M_WAITOK);
+ ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, 0);
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, M_WAITOK);
+ ctx->f_rname = malloc(nmlen + 1, M_SMBFSDATA, 0);
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, M_WAITOK);
+ ctx = malloc(sizeof(*ctx), M_SMBFSDATA, 0);
if (ctx == NULL)
return ENOMEM;
bzero(ctx, sizeof(*ctx));
OpenPOWER on IntegriCloud