Date: Wed, 8 Oct 2014 22:47:28 -0700 From: Neel Natu <neelnatu@gmail.com> To: dteske@freebsd.org Cc: svn-src-releng@freebsd.org, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, Neel Natu <neel@freebsd.org> Subject: Re: svn commit: r272752 - releng/10.1/sys/kern Message-ID: <CAFgRE9FnVx1JMSxMu5yqBdaZL0dtSC0n=0BsWnRBjyyCMbe8sA@mail.gmail.com> In-Reply-To: <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org> References: <201410081539.s98FdPQo052864@svn.freebsd.org> <2a6d01cfe37c$ef5cf410$ce16dc30$@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Devin, On Wed, Oct 8, 2014 at 9:53 PM, <dteske@freebsd.org> 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 > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFgRE9FnVx1JMSxMu5yqBdaZL0dtSC0n=0BsWnRBjyyCMbe8sA>