From owner-dev-commits-src-all@freebsd.org Thu Jul 1 18:33:00 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B271C6509C2 for ; Thu, 1 Jul 2021 18:33:00 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb32.google.com (mail-yb1-xb32.google.com [IPv6:2607:f8b0:4864:20::b32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GG6K755DHz4kCP for ; Thu, 1 Jul 2021 18:32:59 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb32.google.com with SMTP id m9so12367071ybo.5 for ; Thu, 01 Jul 2021 11:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Im7Fp8N/9lKecAGFNhX2fWeGHfBZclm5W+RnT4iQiqw=; b=m/gOrBpZuFbnh27SL3Hvsvy/9yuVzxhXA3YTarsYDq54W12ynT1diISu92cn1u8FtB nETTJdPMFHwru0SbrFigELNbTEmDXm60zhW1iU6w4+5qCnKsrWnd4SXz0LWAm4A+8826 kUhLeiPiLrZUFPq8mw7/6iFLzU1IVJdqRHWjk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Im7Fp8N/9lKecAGFNhX2fWeGHfBZclm5W+RnT4iQiqw=; b=P0qrLRX5S7wscGMcoY6sm/BjaI3KsVA5sTzZEjh8o/BlZ3OGrRVmcT9BdoJT6lQ64d rHfkAUwFdcGRON0aY6Y3+BJpHMDNVaq1dnbb3oo2sf5kztgQnaVEDh/N6sxgp/LjKozQ 2SL6kPZNP/hIIWhUUkDoj+HMQcYYDC/NdWqFDqYOZGV53lM0OVcPfWkp04ytbeYUknrv /v63FMfpmUQQU1Hf6WlS/ynJmTiTOU7L1mR8Aml7PCaaFoUC2c1qEjPSx7f4XYNvRTdS OfEG9w3UYwxxu/btfc9PcCYWXCAZNGWMmBAqRJV8sP+MTuH8bf8igRUYuM+iFtWB2shT hQKA== X-Gm-Message-State: AOAM530azj4TX2cOWOOJ9cGN8Yfof/rsf+DxYqQMnuh14P9T/qAAh7ja hOrGx8l40acHxZXyv8/o2av5kQeknLBSpnjvFJ9pcw== X-Google-Smtp-Source: ABdhPJwQvSjrmqqQKSP7NUHzk8l8J0kMzJalBZOKZ4aKa99GI+py+KAsyjgJ6l2gUrVeM7ef8ESWtVYwzAZIDpdnxIA= X-Received: by 2002:a25:c7d1:: with SMTP id w200mr1455163ybe.455.1625164378202; Thu, 01 Jul 2021 11:32:58 -0700 (PDT) MIME-Version: 1.0 References: <202106211449.15LEnsxM086627@gitrepo.freebsd.org> In-Reply-To: <202106211449.15LEnsxM086627@gitrepo.freebsd.org> From: Kevin Bowling Date: Thu, 1 Jul 2021 11:32:46 -0700 Message-ID: Subject: Re: git: c6b2d024d7ee - main - Retore the vnet before returning an error. To: "George V. Neville-Neil" Cc: src-committers , "" , "dev-commits-src-main@FreeBSD.org" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4GG6K755DHz4kCP X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=m/gOrBpZ; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b32 as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [0.25 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[kev009.com]; NEURAL_SPAM_MEDIUM(0.79)[0.786]; NEURAL_SPAM_SHORT(0.77)[0.769]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::b32:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b32:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; NEURAL_HAM_LONG(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::b32:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[dev-commits-src-all] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2021 18:33:00 -0000 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-message Regards, Kevin On Mon, Jun 21, 2021 at 7:50 AM George V. Neville-Neil wrote: > > The branch main has been updated by gnn: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54 > > commit c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54 > Author: George V. Neville-Neil > AuthorDate: 2021-06-21 14:46:20 +0000 > Commit: George V. Neville-Neil > CommitDate: 2021-06-21 14:46:20 +0000 > > Retore the vnet before returning an error. > > Obtained from: Kanndula, Dheeraj > 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 = malloc(sizeof(struct vlan_mc_entry), M_VLAN, M_NOWAIT); > if (mc == 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 = 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"