Date: Thu, 01 Jul 2021 17:29:17 -0700 From: George Neville-Neil <gnn@freebsd.org> To: Kevin Bowling <kevin.bowling@kev009.com> Cc: src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, "dev-commits-src-main@FreeBSD.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: c6b2d024d7ee - main - Retore the vnet before returning an error. Message-ID: <296A20BE-34D2-400F-944E-306FC19B6B84@freebsd.org> In-Reply-To: <CAK7dMtDP_KpYij%2Bme5WfG0CjaksyM_rzG0C5SAtdQCrHj-VOAQ@mail.gmail.com> References: <202106211449.15LEnsxM086627@gitrepo.freebsd.org> <CAK7dMtDP_KpYij%2Bme5WfG0CjaksyM_rzG0C5SAtdQCrHj-VOAQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Good to know. Thanks, George On 1 Jul 2021, at 11:32, Kevin Bowling wrote: > Hi George, > > After the git transition we use the commit author field itself to > communicate authorship. The obtained field should say Netapp, Inc. > See section 9.14 > https://docs.freebsd.org/en/articles/committers-guide/#commit-log-messa= ge > > Regards, > Kevin > > On Mon, Jun 21, 2021 at 7:50 AM George V. Neville-Neil = > <gnn@freebsd.org> wrote: >> >> The branch main has been updated by gnn: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dc6b2d024d7eedbf32f52a17bc029= c92f5a4d1a54 >> >> commit c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54 >> Author: George V. Neville-Neil <gnn@FreeBSD.org> >> AuthorDate: 2021-06-21 14:46:20 +0000 >> Commit: George V. Neville-Neil <gnn@FreeBSD.org> >> CommitDate: 2021-06-21 14:46:20 +0000 >> >> Retore the vnet before returning an error. >> >> Obtained from: Kanndula, Dheeraj <Dheeraj.Kandula@netapp.com> >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D30741 >> --- >> sys/net/if_vlan.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c >> index bd3a5335a97f..39f767c2a603 100644 >> --- a/sys/net/if_vlan.c >> +++ b/sys/net/if_vlan.c >> @@ -609,6 +609,7 @@ vlan_setmulti(struct ifnet *ifp) >> mc =3D malloc(sizeof(struct vlan_mc_entry), M_VLAN, = >> M_NOWAIT); >> if (mc =3D=3D NULL) { >> IF_ADDR_WUNLOCK(ifp); >> + CURVNET_RESTORE(); >> return (ENOMEM); >> } >> bcopy(ifma->ifma_addr, &mc->mc_addr, = >> ifma->ifma_addr->sa_len); >> @@ -619,8 +620,10 @@ vlan_setmulti(struct ifnet *ifp) >> CK_SLIST_FOREACH (mc, &sc->vlan_mc_listhead, mc_entries) { >> error =3D if_addmulti(ifp_p, (struct sockaddr = >> *)&mc->mc_addr, >> NULL); >> - if (error) >> + if (error) { >> + CURVNET_RESTORE(); >> return (error); >> + } >> } >> >> CURVNET_RESTORE(); >> _______________________________________________ >> dev-commits-src-main@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main >> To unsubscribe, send any mail to = >> "dev-commits-src-main-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?296A20BE-34D2-400F-944E-306FC19B6B84>