diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2011-10-23 10:13:20 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2011-10-23 10:13:20 +0000 |
| commit | 68270a37c8e095666a8b2325e13149e4df62790e (patch) | |
| tree | 268e65b8b4960f6ca979e67abddbf7bda84a1c1e | |
| parent | f54a3a046ef3ee440be855d755596c4af99f5845 (diff) | |
| download | src-68270a37c8e095666a8b2325e13149e4df62790e.tar.gz src-68270a37c8e095666a8b2325e13149e4df62790e.zip | |
Absense of M_WAITOK in malloc flags for UMA doesn't
equals presense of M_NOWAIT. Specify M_NOWAIT explicitly.
This fixes sleeping with PF_LOCK().
Notes
Notes:
svn path=/head/; revision=226656
| -rw-r--r-- | sys/contrib/pf/net/if_pfsync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c index 4aaca76db972..a1f56307c1e0 100644 --- a/sys/contrib/pf/net/if_pfsync.c +++ b/sys/contrib/pf/net/if_pfsync.c @@ -762,7 +762,7 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags) if (flags & PFSYNC_SI_IOCTL) pool_flags = PR_WAITOK | PR_ZERO; else - pool_flags = PR_ZERO; + pool_flags = PR_NOWAIT | PR_ZERO; if ((st = pool_get(&V_pf_state_pl, pool_flags)) == NULL) goto cleanup; |