Date: Sun, 23 Oct 2011 10:13:20 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226656 - head/sys/contrib/pf/net Message-ID: <201110231013.p9NADKr5022660@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sun Oct 23 10:13:20 2011 New Revision: 226656 URL: http://svn.freebsd.org/changeset/base/226656 Log: 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(). Modified: head/sys/contrib/pf/net/if_pfsync.c Modified: head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- head/sys/contrib/pf/net/if_pfsync.c Sun Oct 23 10:05:25 2011 (r226655) +++ head/sys/contrib/pf/net/if_pfsync.c Sun Oct 23 10:13:20 2011 (r226656) @@ -762,7 +762,7 @@ pfsync_state_import(struct pfsync_state 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110231013.p9NADKr5022660>