From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 05:47:29 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85202D1D; Thu, 9 Oct 2014 05:47:29 +0000 (UTC) Received: from mail-qg0-x22f.google.com (mail-qg0-x22f.google.com [IPv6:2607:f8b0:400d:c04::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0419B7D0; Thu, 9 Oct 2014 05:47:28 +0000 (UTC) Received: by mail-qg0-f47.google.com with SMTP id i50so597107qgf.6 for ; Wed, 08 Oct 2014 22:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=gWUgsWNyr2J/b8/RK1MJROMjYN6wSXrW6vQYQB3zTwQ=; b=z1DbtiWiyEfnyql5SpFwQ7W66F1eEtobjskgyaLUKBFRyky7Tif1e5q2P+ys368aFa Y2xSfE7rVUnlCEQ8rg268S6eUTxbi4CWXREB3Uzpyy1k9Gwu8sVNAt6uPrh/pZJsmaht WBd0znlDyz+Q9RR9GvmIVN0NiwsHKCufKnjpHs45WNaecO68908aCV5cd58QUd0ze3TC s7JAnoUe4CPoecCCHnFSsZ7pZnjE98vu5a3QOCsKsGzhlwIJo9dfevQdaDwOgzk/WFHu Ue3lJ/1tSgfJl9gH2q9/C3ITRS3kHPgvPc+4sG+xuFwNRNVG0dr/fAuA1odAWXMPltoR KVaA== MIME-Version: 1.0 X-Received: by 10.140.39.240 with SMTP id v103mr50793733qgv.23.1412833648107; Wed, 08 Oct 2014 22:47:28 -0700 (PDT) Received: by 10.140.85.83 with HTTP; Wed, 8 Oct 2014 22:47:28 -0700 (PDT) In-Reply-To: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> Date: Wed, 8 Oct 2014 22:47:28 -0700 Message-ID: Subject: Re: svn commit: r272752 - releng/10.1/sys/kern From: Neel Natu To: dteske@freebsd.org Content-Type: text/plain; charset=UTF-8 Cc: svn-src-releng@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Neel Natu X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2014 05:47:29 -0000 Hi Devin, On Wed, Oct 8, 2014 at 9:53 PM, wrote: > > >> -----Original Message----- >> From: owner-src-committers@freebsd.org [mailto:owner-src- >> committers@freebsd.org] On Behalf Of Neel Natu >> Sent: Wednesday, October 8, 2014 8:39 AM >> To: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src- >> releng@freebsd.org >> Subject: svn commit: r272752 - releng/10.1/sys/kern >> >> Author: neel >> Date: Wed Oct 8 15:39:24 2014 >> New Revision: 272752 >> URL: https://svnweb.freebsd.org/changeset/base/272752 >> >> Log: >> MFC r272270: > > I hate to pick nits, but I believe this revision (272752 in releng/10.1) > should (I suggest; deferring to re@ for final prognosis) perhaps have > _not_ been an MFC from head (r272270; as was performed) but > perhaps have instead been MFS from stable/10 (r272726). > The svn command used to do the merge was: # svn merge -c 272726 ^/stable/10 releng/10.1 This is exactly as per the SVN merge guidelines into releng as documented here: https://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html The commit message used "MFC r272270" because that was the origin of the change and has the full details about the patch. best Neel > The nit being that mergeinfo now shows (unnaturally) that things > flowed from head -> stable / head -> releng versus > head -> stable -> releng as I suggest would have been cleaner for > historical analysis. > -- > Cheers, > Devin > >> >> tty_rel_free() can be called more than once for the same tty so make sure >> that the tty is dequeued from 'tty_list' only the first time. >> >> Approved by: re (glebius) >> >> Modified: >> releng/10.1/sys/kern/tty.c >> Directory Properties: >> releng/10.1/ (props changed) >> >> Modified: releng/10.1/sys/kern/tty.c >> ========================================================== >> ==================== >> --- releng/10.1/sys/kern/tty.c Wed Oct 8 15:30:59 2014 (r272751) >> +++ releng/10.1/sys/kern/tty.c Wed Oct 8 15:39:24 2014 (r272752) >> @@ -1055,13 +1055,13 @@ tty_rel_free(struct tty *tp) >> tp->t_dev = NULL; >> tty_unlock(tp); >> >> - sx_xlock(&tty_list_sx); >> - TAILQ_REMOVE(&tty_list, tp, t_list); >> - tty_list_count--; >> - sx_xunlock(&tty_list_sx); >> - >> - if (dev != NULL) >> + if (dev != NULL) { >> + sx_xlock(&tty_list_sx); >> + TAILQ_REMOVE(&tty_list, tp, t_list); >> + tty_list_count--; >> + sx_xunlock(&tty_list_sx); >> destroy_dev_sched_cb(dev, tty_dealloc, tp); >> + } >> } >> >> void > >