From owner-svn-src-stable@freebsd.org Thu Apr 2 03:35:17 2020 Return-Path: Delivered-To: svn-src-stable@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 1A2ED2B0444; Thu, 2 Apr 2020 03:35:17 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48t7xF3T7Cz41kd; Thu, 2 Apr 2020 03:35:13 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7A909759; Thu, 2 Apr 2020 03:35:05 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0323Z5jj027521; Thu, 2 Apr 2020 03:35:05 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0323Z5nO027520; Thu, 2 Apr 2020 03:35:05 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004020335.0323Z5nO027520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 2 Apr 2020 03:35:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359557 - stable/12/sys/fs/nfs X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/fs/nfs X-SVN-Commit-Revision: 359557 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 03:35:17 -0000 Author: markj Date: Thu Apr 2 03:35:05 2020 New Revision: 359557 URL: https://svnweb.freebsd.org/changeset/base/359557 Log: MFC r359331: Simplify td_ucred handling in newnfs_connect(). Modified: stable/12/sys/fs/nfs/nfs_commonkrpc.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- stable/12/sys/fs/nfs/nfs_commonkrpc.c Thu Apr 2 01:03:27 2020 (r359556) +++ stable/12/sys/fs/nfs/nfs_commonkrpc.c Thu Apr 2 03:35:05 2020 (r359557) @@ -235,10 +235,8 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq saddr = NFSSOCKADDR(nrp->nr_nam, struct sockaddr *); error = socreate(saddr->sa_family, &so, nrp->nr_sotype, nrp->nr_soproto, td->td_ucred, td); - if (error) { - td->td_ucred = origcred; + if (error != 0) goto out; - } do { if (error != 0 && pktscale > 2) { if (nmp != NULL && nrp->nr_sotype == SOCK_STREAM && @@ -274,10 +272,8 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq " rsize, wsize\n"); } while (error != 0 && pktscale > 2); soclose(so); - if (error) { - td->td_ucred = origcred; + if (error != 0) goto out; - } client = clnt_reconnect_create(nconf, saddr, nrp->nr_prog, nrp->nr_vers, sndreserve, rcvreserve); @@ -425,11 +421,10 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq mtx_unlock(&nrp->nr_mtx); } - +out: /* Restore current thread's credentials. */ td->td_ucred = origcred; -out: NFSEXITCODE(error); return (error); }