From nobody Thu May 18 00:13:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QM9S02ZYHz4Bm54; Thu, 18 May 2023 00:13:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QM9S01pY8z3lQY; Thu, 18 May 2023 00:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684368816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dKDZsyAgbXWUqENY055mKyQYjS7cBRT94C/2UN86Kg=; b=WOVj8dt/LQS6Y4ht25AElACp03V66I+cvt+DbESPUHhpynmL4Rq45o6Vw2TEvRiAW6HDyk sl/aWm4neTDROUXMHkN+YRBTlO9QCa+YwxiaccN+iILagIvFCwkzSKxb/Ik02ayerCG3N+ rkcxEhGdDCo+3cM6i4rsRffn2hE3oL+KkSqIM6xKf/Zpkyxn4I6h4Rc60lDVZ4xEwFmJP2 jsIsIu1AOXEPIk6hiLbpfvRqtEtF+NnklvMiGoXwaCbiiXIqny9Zh2bvQb8q7az6bww6gU SG3OGZzdgC9kJJXykqbzL1WRW8rUIldN8bKzKq+otZr90CARkE6CO1dxlOylag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684368816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dKDZsyAgbXWUqENY055mKyQYjS7cBRT94C/2UN86Kg=; b=hBSJfx4gL+7sPpbCbyhJCoyVPwPKU+lmX4fvyeXVWICTLjd/jQyJ4oST7k8BUExQHqVrXY pH+iz0eJ0yEyeKUVVm+HCKOAfBFA/gk0R2+sELxARwlcjEpMLQuc4qPz1uVQObkA9iJzYS dIEgskirjsqlPZl8kdMIf/0DJ6sHabBIRv3ep+yTB4BKZJN8uHmJsJby8a4v97vDEsteVp /BajXluiFoOFnv6Jv6Oxi/Sa9p9IqkcQQIMyO9oXGm0pjVEcbMSUjtUciva1uwbyVjMI0q wFWNLxngcazAOfJlNrWyFGR1mDePf2RbhfPfVFAxPhR+NFn6jNlSunf6PJvacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684368816; a=rsa-sha256; cv=none; b=lvBad6SjPaWORqRhEqftViHu141SMC7NblVz8FnIq77IauX/6j0OY7VBLqCxGGMKWflbbd AcJP4FG3UI12wACom+rRKPDb7k1C+UpCFZAC5111TOC26pWUjU8vSF0+dCPVuvy++OJvYp 9Fi3YrgVkGB5SgnphgDtZxjdKlvbFH4c2w6r6BNZrrkWJstCZREtRwEpVIXMS6shbBcSr2 0WaYs53oOqH6DpKysoE6+9n/I88dXUkXDrljYyZm27Sp4AV2qNOMCctK30plj3T2zAMiO0 vOWoCKwiiC770WLT1uSxrg+qdsiHKoFh/gwIL6REL/qnMa7X1cBWqArA2sE7Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QM9S00syNzPgV; Thu, 18 May 2023 00:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34I0DaSj055218; Thu, 18 May 2023 00:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34I0DaNL055217; Thu, 18 May 2023 00:13:36 GMT (envelope-from git) Date: Thu, 18 May 2023 00:13:36 GMT Message-Id: <202305180013.34I0DaNL055217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 46910ffacbfe - stable/13 - krpc: Remove VNET_NFSD #ifdefs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46910ffacbfeadb08a3421c2d4995d1a244768c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=46910ffacbfeadb08a3421c2d4995d1a244768c4 commit 46910ffacbfeadb08a3421c2d4995d1a244768c4 Author: Rick Macklem AuthorDate: 2023-02-14 21:53:39 +0000 Commit: Rick Macklem CommitDate: 2023-05-18 00:12:26 +0000 krpc: Remove VNET_NFSD #ifdefs The consensus is that the VNET_NFSD kernel option is not needed, so this commit removes its use from the kernel RPC. (cherry picked from commit 364391a9bb5eb85af5f711a952ba40a4b1f768da) --- sys/rpc/svc_auth.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/rpc/svc_auth.c b/sys/rpc/svc_auth.c index a5c9753c4fde..22ce83f72bdb 100644 --- a/sys/rpc/svc_auth.c +++ b/sys/rpc/svc_auth.c @@ -198,12 +198,7 @@ svc_getcred(struct svc_req *rqst, struct ucred **crp, int *flavorp) cr->cr_uid = cr->cr_ruid = cr->cr_svuid = xprt->xp_uid; crsetgroups(cr, xprt->xp_ngrps, xprt->xp_gidp); cr->cr_rgid = cr->cr_svgid = xprt->xp_gidp[0]; -#ifdef VNET_NFSD - if (jailed(curthread->td_ucred)) - cr->cr_prison = curthread->td_ucred->cr_prison; - else -#endif - cr->cr_prison = &prison0; + cr->cr_prison = curthread->td_ucred->cr_prison; prison_hold(cr->cr_prison); *crp = cr; return (TRUE); @@ -216,12 +211,7 @@ svc_getcred(struct svc_req *rqst, struct ucred **crp, int *flavorp) cr->cr_uid = cr->cr_ruid = cr->cr_svuid = xcr->cr_uid; crsetgroups(cr, xcr->cr_ngroups, xcr->cr_groups); cr->cr_rgid = cr->cr_svgid = cr->cr_groups[0]; -#ifdef VNET_NFSD - if (jailed(curthread->td_ucred)) - cr->cr_prison = curthread->td_ucred->cr_prison; - else -#endif - cr->cr_prison = &prison0; + cr->cr_prison = curthread->td_ucred->cr_prison; prison_hold(cr->cr_prison); *crp = cr; return (TRUE);