jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-02 04:13:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allocate memory with M_NOWAIT instead of M_WAITOK, because it's possible

Browse Source 
for these routines to be called from an interrupt context.

PR:		kern/20057
This commit is contained in:
Archie Cobbs 2000-07-20 17:23:49 +00:00
parent aec01c66a8
commit d2ea40c23f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=63675
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netgraph/ng_base.c
View File

@ -355,7 +355,7 @@ ng_make_node_common(struct ng_type *type, node_p *nodepp)
}
/* Make a node and try attach it to the type */
MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_WAITOK);
MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_NOWAIT);
if (node == NULL) {
TRAP_ERROR;
return (ENOMEM);
@ -557,7 +557,7 @@ ng_name_node(node_p node, const char *name)
}
/* Allocate space and copy it */
MALLOC(node->name, char *, strlen(name) + 1, M_NETGRAPH, M_WAITOK);
MALLOC(node->name, char *, strlen(name) + 1, M_NETGRAPH, M_NOWAIT);
if (node->name == NULL) {
TRAP_ERROR;
return (ENOMEM);
@ -674,7 +674,7 @@ ng_add_hook(node_p node, const char *name, hook_p *hookp)
}
/* Allocate the hook and link it up */
MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_WAITOK);
MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_NOWAIT);
if (hook == NULL) {
TRAP_ERROR;
return (ENOMEM);
@ -698,7 +698,7 @@ ng_add_hook(node_p node, const char *name, hook_p *hookp)
node->numhooks++;
/* Set hook name */
MALLOC(hook->name, char *, strlen(name) + 1, M_NETGRAPH, M_WAITOK);
MALLOC(hook->name, char *, strlen(name) + 1, M_NETGRAPH, M_NOWAIT);
if (hook->name == NULL) {
error = ENOMEM;
LIST_REMOVE(hook, hooks);
@ -1107,7 +1107,7 @@ ng_path2node(node_p here, const char *address, node_p *destp, char **rtnp,
/* Now compute return address, i.e., the path to the sender */
if (rtnp != NULL) {
MALLOC(*rtnp, char *, NG_NODELEN + 2, M_NETGRAPH, M_WAITOK);
MALLOC(*rtnp, char *, NG_NODELEN + 2, M_NETGRAPH, M_NOWAIT);
if (*rtnp == NULL) {
TRAP_ERROR;
return (ENOMEM);