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/miscfs/procfs | |
| parent | 27499c264f7ca51323ac65fa859a9287025ca4d4 (diff) | |
remove M_CANFAIL flag for malloc(9) - it was completely ignored, so had
actually no effect
Diffstat (limited to 'sys/miscfs/procfs')
| -rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 663f9def5ec..93072440b2e 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -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); |
