Date: Wed, 8 Oct 2014 21:53:14 -0700 From: <dteske@FreeBSD.org> To: "'Neel Natu'" <neel@FreeBSD.org>, <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-releng@freebsd.org> Cc: dteske@FreeBSD.org Subject: RE: svn commit: r272752 - releng/10.1/sys/kern Message-ID: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> In-Reply-To: <201410081539.s98FdPQo052864@svn.freebsd.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> -----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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2a6d01cfe37c$ef5cf410$ce16dc30$>