From owner-svn-src-head@FreeBSD.ORG Sat Sep 22 12:49:37 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A283106566C; Sat, 22 Sep 2012 12:49:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F006D8FC14; Sat, 22 Sep 2012 12:49:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8MCnaCC069163; Sat, 22 Sep 2012 12:49:36 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MCna84069158; Sat, 22 Sep 2012 12:49:36 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201209221249.q8MCna84069158@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 22 Sep 2012 12:49:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240824 - head/sys/contrib/altq/altq X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Sep 2012 12:49:37 -0000 Author: glebius Date: Sat Sep 22 12:49:36 2012 New Revision: 240824 URL: http://svn.freebsd.org/changeset/base/240824 Log: Convert more M_WAITOK malloc() to M_NOWAIT. Reported by: Kim Culhan Modified: head/sys/contrib/altq/altq/altq_priq.c head/sys/contrib/altq/altq/altq_red.c head/sys/contrib/altq/altq/altq_rio.c Modified: head/sys/contrib/altq/altq/altq_priq.c ============================================================================== --- head/sys/contrib/altq/altq/altq_priq.c Sat Sep 22 12:42:51 2012 (r240823) +++ head/sys/contrib/altq/altq/altq_priq.c Sat Sep 22 12:49:36 2012 (r240824) @@ -362,8 +362,9 @@ priq_class_create(struct priq_if *pif, i if (flags & PRCF_RIO) { cl->cl_red = (red_t *)rio_alloc(0, NULL, red_flags, red_pkttime); - if (cl->cl_red != NULL) - qtype(cl->cl_q) = Q_RIO; + if (cl->cl_red == NULL) + goto err_ret; + qtype(cl->cl_q) = Q_RIO; } else #endif if (flags & PRCF_RED) { @@ -371,8 +372,9 @@ priq_class_create(struct priq_if *pif, i qlimit(cl->cl_q) * 10/100, qlimit(cl->cl_q) * 30/100, red_flags, red_pkttime); - if (cl->cl_red != NULL) - qtype(cl->cl_q) = Q_RED; + if (cl->cl_red == NULL) + goto err_ret; + qtype(cl->cl_q) = Q_RED; } } #endif /* ALTQ_RED */ Modified: head/sys/contrib/altq/altq/altq_red.c ============================================================================== --- head/sys/contrib/altq/altq/altq_red.c Sat Sep 22 12:42:51 2012 (r240823) +++ head/sys/contrib/altq/altq/altq_red.c Sat Sep 22 12:49:36 2012 (r240824) @@ -231,10 +231,9 @@ red_alloc(int weight, int inv_pmax, int int w, i; int npkts_per_sec; - rp = malloc(sizeof(red_t), M_DEVBUF, M_WAITOK); + rp = malloc(sizeof(red_t), M_DEVBUF, M_NOWAIT | M_ZERO); if (rp == NULL) return (NULL); - bzero(rp, sizeof(red_t)); rp->red_avg = 0; rp->red_idle = 1; Modified: head/sys/contrib/altq/altq/altq_rio.c ============================================================================== --- head/sys/contrib/altq/altq/altq_rio.c Sat Sep 22 12:42:51 2012 (r240823) +++ head/sys/contrib/altq/altq/altq_rio.c Sat Sep 22 12:49:36 2012 (r240824) @@ -204,10 +204,9 @@ rio_alloc(int weight, struct redparams * int w, i; int npkts_per_sec; - rp = malloc(sizeof(rio_t), M_DEVBUF, M_WAITOK); + rp = malloc(sizeof(rio_t), M_DEVBUF, M_NOWAIT | M_ZERO); if (rp == NULL) return (NULL); - bzero(rp, sizeof(rio_t)); rp->rio_flags = flags; if (pkttime == 0)