svn commit: r226656 - head/sys/contrib/pf/net

[Gleb Smirnoff]

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;