Module Name: src
Committed By: jdolecek
Date: Sun Oct 14 17:37:40 UTC 2018
Modified Files:
src/common/lib/libprop: prop_kern.c
src/sys/arch/x86/x86: ipmi.c
src/sys/dev/ata: TODO.ncq
src/sys/dev/pci: mpii.c
src/sys/dev/sdmmc: sbt.c sdmmc_io.c
src/sys/fs/udf: udf_allocation.c udf_subr.c
src/sys/kern: kern_sysctl.c
src/sys/miscfs/procfs: procfs_vnops.c
src/sys/sys: malloc.h
Log Message:
remove M_CANFAIL flag for malloc(9) - it was completely ignored, so had
actually no effect
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/common/lib/libprop/prop_kern.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/x86/ipmi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sbt.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sdmmc/sdmmc_io.c
cvs rdiff -u -r1.39 -r1.40 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.143 -r1.144 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.261 -r1.262 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.204 -r1.205 src/sys/miscfs/procfs/procfs_vnops.c
cvs rdiff -u -r1.116 -r1.117 src/sys/sys/malloc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libprop/prop_kern.c
diff -u src/common/lib/libprop/prop_kern.c:1.23 src/common/lib/libprop/prop_kern.c:1.24
--- src/common/lib/libprop/prop_kern.c:1.23 Sun Jan 29 02:29:06 2017
+++ src/common/lib/libprop/prop_kern.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_kern.c,v 1.23 2017/01/29 02:29:06 christos Exp $ */
+/* $NetBSD: prop_kern.c,v 1.24 2018/10/14 17:37:40 jdolecek Exp $ */
/*-
* Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
@@ -412,10 +412,8 @@ _prop_object_copyin(const struct plistre
/*
* Allocate an extra byte so we can guarantee NUL-termination.
- *
- * Allow malloc to fail in case pmap would be exhausted.
*/
- buf = malloc(pref->pref_len + 1, M_TEMP, M_WAITOK | M_CANFAIL);
+ buf = malloc(pref->pref_len + 1, M_TEMP, M_WAITOK);
if (buf == NULL)
return (ENOMEM);
error = copyin(pref->pref_plist, buf, pref->pref_len);
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.66 src/sys/arch/x86/x86/ipmi.c:1.67
--- src/sys/arch/x86/x86/ipmi.c:1.66 Thu Jun 22 13:32:47 2017
+++ src/sys/arch/x86/x86/ipmi.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.66 2017/06/22 13:32:47 joerg Exp $ */
+/* $NetBSD: ipmi.c,v 1.67 2018/10/14 17:37:40 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.66 2017/06/22 13:32:47 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.67 2018/10/14 17:37:40 jdolecek Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1204,7 +1204,7 @@ get_sdr(struct ipmi_softc *sc, uint16_t
/* Allocate space for entire SDR Length of SDR in header does not
* include header length */
sdrlen = sizeof(shdr) + shdr.record_length;
- psdr = malloc(sdrlen, M_DEVBUF, M_WAITOK|M_CANFAIL);
+ psdr = malloc(sdrlen, M_DEVBUF, M_WAITOK);
if (psdr == NULL)
return -1;
@@ -1832,7 +1832,7 @@ add_child_sensors(struct ipmi_softc *sc,
sc->sc_nsensors += count;
for (idx = 0; idx < count; idx++) {
psensor = malloc(sizeof(struct ipmi_sensor), M_DEVBUF,
- M_WAITOK|M_CANFAIL);
+ M_WAITOK);
if (psensor == NULL)
break;
Index: src/sys/dev/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4 src/sys/dev/ata/TODO.ncq:1.5
--- src/sys/dev/ata/TODO.ncq:1.4 Fri Aug 31 18:44:04 2018
+++ src/sys/dev/ata/TODO.ncq Sun Oct 14 17:37:40 2018
@@ -36,5 +36,3 @@ mvsata - move pci-specific code to the p
mvsata(4) 64-bit DMA
- at least with AHA1430SA does not really work, crash in mvsata_intr() on boot
-
-malloc(M_CANFAIL) actually doesn't do anything
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.11 src/sys/dev/pci/mpii.c:1.12
--- src/sys/dev/pci/mpii.c:1.11 Mon Jan 15 12:58:06 2018
+++ src/sys/dev/pci/mpii.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.11 2018/01/15 12:58:06 maya Exp $ */
+/* $NetBSD: mpii.c,v 1.12 2018/10/14 17:37:40 jdolecek Exp $ */
/* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */
/*
* Copyright (c) 2010 Mike Belopuhov <m...@crypt.org.ru>
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.11 2018/01/15 12:58:06 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.12 2018/10/14 17:37:40 jdolecek Exp $");
#include "bio.h"
@@ -4905,7 +4905,7 @@ mpii_ioctl_cache(struct scsi_link *link,
return (EINVAL);
pagelen = hdr.page_length * 4;
- vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+ vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO);
if (vpg == NULL)
return (ENOMEM);
@@ -5131,7 +5131,7 @@ mpii_ioctl_vol(struct mpii_softc *sc, st
}
pagelen = hdr.page_length * 4;
- vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+ vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO);
if (vpg == NULL) {
printf("%s: unable to allocate space for raid "
"volume page 0\n", DEVNAME(sc));
@@ -5236,7 +5236,7 @@ mpii_ioctl_disk(struct mpii_softc *sc, s
}
pagelen = hdr.page_length * 4;
- vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+ vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO);
if (vpg == NULL) {
printf("%s: unable to allocate space for raid "
"volume page 0\n", DEVNAME(sc));
@@ -5293,7 +5293,7 @@ mpii_bio_hs(struct mpii_softc *sc, struc
}
pagelen = le16toh(ehdr.ext_page_length) * 4;
- cpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+ cpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO);
if (cpg == NULL) {
printf("%s: unable to allocate space for raid config page 0\n",
DEVNAME(sc));
@@ -5348,7 +5348,7 @@ mpii_bio_disk(struct mpii_softc *sc, str
DNPRINTF(MPII_D_IOCTL, "%s: mpii_bio_disk %d\n", DEVNAME(sc),
bd->bd_diskid);
- ppg = malloc(sizeof(*ppg), M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+ ppg = malloc(sizeof(*ppg), M_TEMP, M_WAITOK | M_ZERO);
if (ppg == NULL) {
printf("%s: unable to allocate space for raid physical disk "
"page 0\n", DEVNAME(sc));
Index: src/sys/dev/sdmmc/sbt.c
diff -u src/sys/dev/sdmmc/sbt.c:1.6 src/sys/dev/sdmmc/sbt.c:1.7
--- src/sys/dev/sdmmc/sbt.c:1.6 Wed Apr 18 14:56:35 2018
+++ src/sys/dev/sdmmc/sbt.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $ */
+/* $NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $ */
/* $OpenBSD: sbt.c,v 1.9 2007/06/19 07:59:57 uwe Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Type-A/B SDIO Bluetooth cards */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -182,7 +182,7 @@ sbt_attach(device_t parent, device_t sel
/* It may be Type-B, but we use it only in Type-A mode. */
printf("%s: SDIO Bluetooth Type-A\n", DEVNAME(sc));
- sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT | M_CANFAIL);
+ sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT);
if (sc->sc_buf == NULL) {
aprint_error("%s: can't allocate cmd buffer\n", DEVNAME(sc));
return;
Index: src/sys/dev/sdmmc/sdmmc_io.c
diff -u src/sys/dev/sdmmc/sdmmc_io.c:1.13 src/sys/dev/sdmmc/sdmmc_io.c:1.14
--- src/sys/dev/sdmmc/sdmmc_io.c:1.13 Mon Oct 23 13:47:17 2017
+++ src/sys/dev/sdmmc/sdmmc_io.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $ */
+/* $NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $ */
/* $OpenBSD: sdmmc_io.c,v 1.10 2007/09/17 01:33:33 krw Exp $ */
/*
@@ -20,7 +20,7 @@
/* Routines for SD I/O cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -636,12 +636,11 @@ sdmmc_intr_establish(device_t dev, int (
if (sc->sc_sct->card_enable_intr == NULL)
return NULL;
- ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO);
+ ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_ZERO);
if (ih == NULL)
return NULL;
- ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF,
- M_WAITOK|M_CANFAIL|M_ZERO);
+ ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF, M_WAITOK|M_ZERO);
if (ih->ih_name == NULL) {
free(ih, M_DEVBUF);
return NULL;
Index: src/sys/fs/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.39 src/sys/fs/udf/udf_allocation.c:1.40
--- src/sys/fs/udf/udf_allocation.c:1.39 Wed Jan 4 15:53:14 2017
+++ src/sys/fs/udf/udf_allocation.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.39 2017/01/04 15:53:14 christos Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.39 2017/01/04 15:53:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $");
#endif /* not lint */
@@ -1540,8 +1540,7 @@ udf_trunc_metadatapart(struct udf_mount
*sizepos = udf_rw32(*sizepos) - to_trunc;
/* realloc bitmap for better memory usage */
- new_sbd = realloc(sbd, inf_len, M_UDFVOLD,
- M_CANFAIL | M_WAITOK);
+ new_sbd = realloc(sbd, inf_len, M_UDFVOLD, M_WAITOK);
if (new_sbd) {
/* update pointers */
ump->metadata_unalloc_dscr = new_sbd;
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.143 src/sys/fs/udf/udf_subr.c:1.144
--- src/sys/fs/udf/udf_subr.c:1.143 Thu Aug 9 20:30:26 2018
+++ src/sys/fs/udf/udf_subr.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.143 2018/08/09 20:30:26 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.144 2018/10/14 17:37:40 jdolecek Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.143 2018/08/09 20:30:26 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.144 2018/10/14 17:37:40 jdolecek Exp $");
#endif /* not lint */
@@ -1771,7 +1771,7 @@ udf_read_metadata_partition_spacetable(s
"%"PRIu64" bytes\n", inflen));
/* allocate space for bitmap */
- dscr = malloc(inflen, M_UDFVOLD, M_CANFAIL | M_WAITOK);
+ dscr = malloc(inflen, M_UDFVOLD, M_WAITOK);
if (!dscr)
return ENOMEM;
@@ -2739,7 +2739,7 @@ udf_vat_write(struct udf_node *vat_node,
/* realloc */
new_vat_table = realloc(ump->vat_table,
ump->vat_table_alloc_len + UDF_VAT_CHUNKSIZE,
- M_UDFVOLD, M_WAITOK | M_CANFAIL);
+ M_UDFVOLD, M_WAITOK);
if (!new_vat_table) {
printf("udf_vat_write: can't extent VAT, out of mem\n");
return ENOMEM;
@@ -2936,8 +2936,7 @@ udf_check_for_vat(struct udf_node *vat_n
((vat_length + UDF_VAT_CHUNKSIZE-1) / UDF_VAT_CHUNKSIZE)
* UDF_VAT_CHUNKSIZE;
- vat_table = malloc(vat_table_alloc_len, M_UDFVOLD,
- M_CANFAIL | M_WAITOK);
+ vat_table = malloc(vat_table_alloc_len, M_UDFVOLD, M_WAITOK);
if (vat_table == NULL) {
printf("allocation of %d bytes failed for VAT\n",
vat_table_alloc_len);
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.261 src/sys/kern/kern_sysctl.c:1.262
--- src/sys/kern/kern_sysctl.c:1.261 Sat Jan 27 00:00:26 2018
+++ src/sys/kern/kern_sysctl.c Sun Oct 14 17:37:40 2018
@@ -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, i
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,
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);
Index: src/sys/miscfs/procfs/procfs_vnops.c
diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.204 src/sys/miscfs/procfs/procfs_vnops.c:1.205
--- src/sys/miscfs/procfs/procfs_vnops.c:1.204 Mon Sep 3 16:29:35 2018
+++ src/sys/miscfs/procfs/procfs_vnops.c Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.204 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: procfs_vnops.c,v 1.205 2018/10/14 17:37:40 jdolecek Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.204 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.205 2018/10/14 17:37:40 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -664,7 +664,7 @@ procfs_getattr(void *v)
/*FALLTHROUGH*/
case PFScwd:
case PFSchroot:
- path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK|M_CANFAIL);
+ path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK);
if (path == NULL && procp != NULL) {
procfs_proc_unlock(procp);
return (ENOMEM);
@@ -1629,7 +1629,7 @@ procfs_readlink(void *v)
pfs->pfs_fileno == PROCFS_FILENO(pfs->pfs_pid, PFSchroot, -1)) {
if ((error = procfs_proc_lock(pfs->pfs_pid, &pown, ESRCH)) != 0)
return error;
- path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK|M_CANFAIL);
+ path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK);
if (path == NULL) {
procfs_proc_unlock(pown);
return (ENOMEM);
Index: src/sys/sys/malloc.h
diff -u src/sys/sys/malloc.h:1.116 src/sys/sys/malloc.h:1.117
--- src/sys/sys/malloc.h:1.116 Sat Dec 27 19:32:57 2014
+++ src/sys/sys/malloc.h Sun Oct 14 17:37:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.h,v 1.116 2014/12/27 19:32:57 maxv Exp $ */
+/* $NetBSD: malloc.h,v 1.117 2018/10/14 17:37:40 jdolecek Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -42,8 +42,7 @@
#define M_WAITOK 0x0000 /* can wait for resources */
#define M_NOWAIT 0x0001 /* do not wait for resources */
#define M_ZERO 0x0002 /* zero the allocation */
-#define M_CANFAIL 0x0004 /* can fail if requested memory can't ever
- * be allocated */
+
#include <sys/mallocvar.h>
#if 0
/*
