From owner-svn-src-stable-8@FreeBSD.ORG Wed May 25 10:38:50 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49B1C106566C; Wed, 25 May 2011 10:38:50 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 374308FC17; Wed, 25 May 2011 10:38:49 +0000 (UTC) Received: by wyf23 with SMTP id 23so7680504wyf.13 for ; Wed, 25 May 2011 03:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=RmS310fRcmJKW1rSdT39D0bC0ZSJaQ9cQSTue8aUE5E=; b=a7dNc9WXXVhk0eqZlF1Rm7EdpTfFoaCdBtGVGYgw8YESZG1t5K4hzSq6wQdg0sWMKt GAlep4UohkBO9OQ5EOgtjFfYpFpy2Z53Su3+3w5seOGiRUzQPCAxjHjUOrx7Ft3c6w38 y6S45dCdLmdfOC7e2Z/6Nk+dyBsDPCpmIi6KU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=MvvkMosCI3iVk7A1yooOTSwk1efkSSUFa2s55YE7mQQwKVdA0+jpbWUhipmjvCJzcQ HoMeYy4CHVab49JbI4ZcCFn5UCf07/aIOJZ7b19+KSkvPcivlp3AtgYiyjxkF+9r5Wlv XcUl9ryVc5/sETYI7s5pcFTXJgaMUcrNcLyQY= MIME-Version: 1.0 Received: by 10.227.58.82 with SMTP id f18mr4471335wbh.45.1306318289256; Wed, 25 May 2011 03:11:29 -0700 (PDT) Received: by 10.227.209.209 with HTTP; Wed, 25 May 2011 03:11:29 -0700 (PDT) In-Reply-To: <201105250325.p4P3PEvI097170@svn.freebsd.org> References: <201105250325.p4P3PEvI097170@svn.freebsd.org> Date: Wed, 25 May 2011 12:11:29 +0200 Message-ID: From: Oliver Pinter To: Konstantin Belousov Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r222274 - stable/8/sys/kern X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2011 10:38:50 -0000 MFC to 7-STABLE? On 5/25/11, Konstantin Belousov wrote: > Author: kib > Date: Wed May 25 03:25:14 2011 > New Revision: 222274 > URL: http://svn.freebsd.org/changeset/base/222274 > > Log: > MFC r222086: > The protection against the race with dev_rel(), introduced in r163328, > should be extended to cover destroy_devl() calls for the children of the > destroyed dev. > > Modified: > stable/8/sys/kern/kern_conf.c > Directory Properties: > stable/8/sys/ (props changed) > stable/8/sys/amd64/include/xen/ (props changed) > stable/8/sys/cddl/contrib/opensolaris/ (props changed) > stable/8/sys/contrib/dev/acpica/ (props changed) > stable/8/sys/contrib/pf/ (props changed) > > Modified: stable/8/sys/kern/kern_conf.c > ============================================================================== > --- stable/8/sys/kern/kern_conf.c Wed May 25 01:04:12 2011 (r222273) > +++ stable/8/sys/kern/kern_conf.c Wed May 25 03:25:14 2011 (r222274) > @@ -885,6 +885,8 @@ destroy_devl(struct cdev *dev) > /* Remove name marking */ > dev->si_flags &= ~SI_NAMED; > > + dev->si_refcount++; /* Avoid race with dev_rel() */ > + > /* If we are a child, remove us from the parents list */ > if (dev->si_flags & SI_CHILD) { > LIST_REMOVE(dev, si_siblings); > @@ -901,7 +903,6 @@ destroy_devl(struct cdev *dev) > dev->si_flags &= ~SI_CLONELIST; > } > > - dev->si_refcount++; /* Avoid race with dev_rel() */ > csw = dev->si_devsw; > dev->si_devsw = NULL; /* already NULL for SI_ALIAS */ > while (csw != NULL && csw->d_purge != NULL && dev->si_threadcount) { > _______________________________________________ > svn-src-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" >