From owner-cvs-all@FreeBSD.ORG Sat Jan 14 20:47:12 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0F4C16A420; Sat, 14 Jan 2006 20:47:12 +0000 (GMT) (envelope-from nate@root.org) Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C03E43D46; Sat, 14 Jan 2006 20:47:12 +0000 (GMT) (envelope-from nate@root.org) Received: from [10.0.5.50] (ppp-71-139-44-114.dsl.snfc21.pacbell.net [71.139.44.114]) by www.cryptography.com (8.12.8/8.12.8) with ESMTP id k0EKlBVK005827 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 14 Jan 2006 12:47:11 -0800 Message-ID: <43C9636B.6070500@root.org> Date: Sat, 14 Jan 2006 12:47:39 -0800 From: Nate Lawson User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Poul-Henning Kamp References: <20060114094150.6B81C16A449@hub.freebsd.org> In-Reply-To: <20060114094150.6B81C16A449@hub.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/kern subr_bus.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2006 20:47:12 -0000 Poul-Henning Kamp wrote: > phk 2006-01-14 09:41:35 UTC > > FreeBSD src repository > > Modified files: > sys/kern subr_bus.c > Log: > Correct STAILQ usage in purge of resourcelist. > > Found with: Coverity Prevent(tm) > > Revision Changes Path > 1.188 +1 -1 src/sys/kern/subr_bus.c > > > Index: src/sys/kern/subr_bus.c > diff -u src/sys/kern/subr_bus.c:1.187 src/sys/kern/subr_bus.c:1.188 > --- src/sys/kern/subr_bus.c:1.187 Tue Oct 4 22:25:14 2005 > +++ src/sys/kern/subr_bus.c Sat Jan 14 09:41:35 2006 > @@ -2820,7 +2820,7 @@ > { > struct resource_list_entry *rle; > > - STAILQ_FOREACH(rle, rl, link) { > + while ((rle = STAILQ_FIRST(rl)) != NULL) { > if (rle->res) > bus_release_resource(rman_get_device(rle->res), > rle->type, rle->rid, rle->res); Isn't that what the STAILQ_FOREACH_SAFE() macro is for? List traversal with deletion? Your approach is also fine. -- Nate