From owner-svn-src-user@FreeBSD.ORG  Tue Oct 13 13:08:05 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F1BCC10656A5;
	Tue, 13 Oct 2009 13:08:05 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E176F8FC1B;
	Tue, 13 Oct 2009 13:08:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DD85pY006485;
	Tue, 13 Oct 2009 13:08:05 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9DD855O006482;
	Tue, 13 Oct 2009 13:08:05 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910131308.n9DD855O006482@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Tue, 13 Oct 2009 13:08:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198031 - user/eri/pf45/head/sys/contrib/pf/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 13:08:06 -0000

Author: eri
Date: Tue Oct 13 13:08:05 2009
New Revision: 198031
URL: http://svn.freebsd.org/changeset/base/198031

Log:
  * Change flags of memory allocation to NOWAIT to avoid LORs.

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Tue Oct 13 13:03:31 2009	(r198030)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Tue Oct 13 13:08:05 2009	(r198031)
@@ -1593,7 +1593,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
 			break;
 		}
 #ifdef __FreeBSD__
-		rule = pool_get(&pf_rule_pl, PR_WAITOK);
+		rule = pool_get(&pf_rule_pl, PR_NOWAIT);
 #else
 		rule = pool_get(&pf_rule_pl, PR_WAITOK|PR_LIMITFAIL);
 #endif
@@ -1857,7 +1857,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
 
 		if (pcr->action != PF_CHANGE_REMOVE) {
 #ifdef __FreeBSD__
-			newrule = pool_get(&pf_rule_pl, PR_WAITOK);
+			newrule = pool_get(&pf_rule_pl, PR_NOWAIT);
 #else
 			newrule = pool_get(&pf_rule_pl, PR_WAITOK|PR_LIMITFAIL);
 #endif
@@ -2487,7 +2487,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
 			error = EBUSY;
 			break;
 		}
+#ifdef __FreeBSD__
+		altq = pool_get(&pf_altq_pl, PR_NOWAIT);
+#else
 		altq = pool_get(&pf_altq_pl, PR_WAITOK|PR_LIMITFAIL);
+#endif
 		if (altq == NULL) {
 			error = ENOMEM;
 			break;
@@ -2654,7 +2658,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
 			break;
 		}
 #ifdef __FreeBSD__
-		pa = pool_get(&pf_pooladdr_pl, PR_WAITOK);
+		pa = pool_get(&pf_pooladdr_pl, PR_NOWAIT);
 #else
 		pa = pool_get(&pf_pooladdr_pl, PR_WAITOK|PR_LIMITFAIL);
 #endif
@@ -2753,7 +2757,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
 		if (pca->action != PF_CHANGE_REMOVE) {
 			newpa = pool_get(&pf_pooladdr_pl,
 #ifdef __FreeBSD__
-			    PR_WAITOK);
+			    PR_NOWAIT);
 #else
 			    PR_WAITOK|PR_LIMITFAIL);
 #endif