From owner-svn-src-releng@FreeBSD.ORG Thu Oct 9 04:53:21 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92D76FB2; Thu, 9 Oct 2014 04:53:21 +0000 (UTC) Received: from shxd.cx (unknown [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D8EA105; Thu, 9 Oct 2014 04:53:21 +0000 (UTC) Received: from [64.201.244.132] (port=52449 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1XbyZA-0001z5-Pg; Wed, 08 Oct 2014 14:14:36 -0700 From: To: "'Neel Natu'" , , , References: <201410081539.s98FdPQo052864@svn.freebsd.org> In-Reply-To: <201410081539.s98FdPQo052864@svn.freebsd.org> Subject: RE: svn commit: r272752 - releng/10.1/sys/kern Date: Wed, 8 Oct 2014 21:53:14 -0700 Message-ID: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQHn2Nfw981aZc33kCjSST8VwmWjSpv3RzKg Content-Language: en-us Sender: devin@shxd.cx Cc: dteske@FreeBSD.org 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 04:53:21 -0000 > -----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 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