diff options
| author | jdolecek <jdolecek@NetBSD.org> | 2018-10-14 17:37:40 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@NetBSD.org> | 2018-10-14 17:37:40 +0000 |
| commit | 1df1fda95b3fbbe5d2a49a1fcd1bfefbaeba6508 (patch) | |
| tree | d3b8a07267c11ccace1f91a11ac42924d928e87e /sys/kern/kern_sysctl.c | |
| parent | 27499c264f7ca51323ac65fa859a9287025ca4d4 (diff) | |
remove M_CANFAIL flag for malloc(9) - it was completely ignored, so had
actually no effect
Diffstat (limited to 'sys/kern/kern_sysctl.c')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 98e7185d803..a9df58fbbea 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sysctl.c,v 1.261 2018/01/27 00:00:26 christos Exp $ */ +/* $NetBSD: kern_sysctl.c,v 1.262 2018/10/14 17:37:40 jdolecek Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.261 2018/01/27 00:00:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.262 2018/10/14 17:37:40 jdolecek Exp $"); #ifdef _KERNEL_OPT #include "opt_defcorename.h" @@ -945,8 +945,7 @@ sysctl_create(SYSCTLFN_ARGS) * we want a rough idea of what the * size is now */ - vp = malloc(PAGE_SIZE, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + vp = malloc(PAGE_SIZE, M_SYSCTLDATA, M_WAITOK); if (vp == NULL) return (ENOMEM); e = nnode.sysctl_data; @@ -1015,8 +1014,7 @@ sysctl_create(SYSCTLFN_ARGS) if (type != CTLTYPE_NODE) { if (sz != 0) { if (flags & CTLFLAG_OWNDATA) { - own = malloc(sz, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + own = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (own == NULL) return ENOMEM; if (nnode.sysctl_data == NULL) @@ -1579,7 +1577,7 @@ sysctl_lookup(SYSCTLFN_ARGS) * temporary copy of new inbound string */ len = MIN(sz, newlen); - newbuf = malloc(len, M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + newbuf = malloc(len, M_SYSCTLDATA, M_WAITOK); if (newbuf == NULL) { DPRINTF(("%s: oomem %zu\n", __func__, len)); return ENOMEM; @@ -1709,7 +1707,7 @@ sysctl_describe(SYSCTLFN_ARGS) * get ready... */ error = 0; - d = bf = malloc(MAXDESCLEN, M_TEMP, M_WAITOK|M_CANFAIL); + d = bf = malloc(MAXDESCLEN, M_TEMP, M_WAITOK); if (bf == NULL) return ENOMEM; tot = 0; @@ -1807,8 +1805,7 @@ sysctl_describe(SYSCTLFN_ARGS) dnode.sysctl_flags & CTLFLAG_OWNDESC) { char *nd, *k; - k = malloc(MAXDESCLEN, M_TEMP, - M_WAITOK|M_CANFAIL); + k = malloc(MAXDESCLEN, M_TEMP, M_WAITOK); if (k == NULL) { error = ENOMEM; goto out; @@ -1819,8 +1816,7 @@ sysctl_describe(SYSCTLFN_ARGS) free(k, M_TEMP); goto out; } - nd = malloc(sz, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + nd = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (nd == NULL) { free(k, M_TEMP); error = ENOMEM; @@ -2153,7 +2149,7 @@ sysctl_createv(struct sysctllog **log, int cflags, else if (flags & CTLFLAG_OWNDESC) { size_t l = strlen(descr) + 1; char *d = malloc(l, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + M_WAITOK); if (d != NULL) { memcpy(d, descr, l); dnode->sysctl_desc = d; @@ -2280,7 +2276,7 @@ sysctl_destroyv(struct sysctlnode *rnode, ...) char *d; sz = strlen(node->sysctl_desc) + 1; - d = malloc(sz, M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + d = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (d != NULL) { /* * discard const so that we can @@ -2423,13 +2419,13 @@ sysctl_log_add(struct sysctllog **logp, const struct sysctlnode *node) if (*logp == NULL) { log = malloc(sizeof(struct sysctllog), - M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + M_SYSCTLDATA, M_WAITOK); if (log == NULL) { /* XXX print error message? */ return (-1); } log->log_num = malloc(size0 * sizeof(int), - M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + M_SYSCTLDATA, M_WAITOK); if (log->log_num == NULL) { /* XXX print error message? */ free(log, M_SYSCTLDATA); @@ -2659,10 +2655,10 @@ sysctl_alloc(struct sysctlnode *p, int x) if (x == 1) n = malloc(sizeof(struct sysctlnode), - M_SYSCTLNODE, M_WAITOK|M_CANFAIL); + M_SYSCTLNODE, M_WAITOK); else n = malloc(SYSCTL_DEFSIZE * sizeof(struct sysctlnode), - M_SYSCTLNODE, M_WAITOK|M_CANFAIL); + M_SYSCTLNODE, M_WAITOK); if (n == NULL) return (ENOMEM); @@ -2695,7 +2691,7 @@ sysctl_realloc(struct sysctlnode *p) */ olen = p->sysctl_clen; n = malloc(2 * olen * sizeof(struct sysctlnode), M_SYSCTLNODE, - M_WAITOK|M_CANFAIL); + M_WAITOK); if (n == NULL) return (ENOMEM); @@ -2736,7 +2732,7 @@ sysctl_log_realloc(struct sysctllog *log) s = log->log_size * 2; d = log->log_size; - n = malloc(s * sizeof(int), M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + n = malloc(s * sizeof(int), M_SYSCTLDATA, M_WAITOK); if (n == NULL) return (-1); |
