From nobody Tue Feb 14 21:54:30 2023 X-Original-To: dev-commits-src-main@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 4PGZjy3wx6z3q3T7; Tue, 14 Feb 2023 21:54:30 +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 4PGZjy3NpJz4Bj3; Tue, 14 Feb 2023 21:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676411670; 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=kOgXDxNkhz1c4XJVkhQYIqjmZkDgqmKVNbNZnu4F0qk=; b=nn7D+S2KBD5tXJHZVOgoWlf8VJk0p/UqQJ0FKrUu1NEMGj0HB9WIKlxEJKCKVhkUmwLOqw 2zxR1APX3TTh/RN9HTAS8Ga2nVK1nGGCaTPFGA4yvuUPzuaYMBhMzoSFaAsH7m1nOJHR5t uR5XUsy3tKwcVb8QmPYIOho0U68+1AnhaAJXorrMy0hSYzVFhbh5ImkQ5DrlwZwevN7BR7 kO37Imfqz19H58kgCYbDkYrHzh3tz4aeIXXrDs2skDHRs751WOvkhhEk2SnFvaqg0bhgDI ANW1Hc9PDTDXAuoOvHZlguNe6b2y0DtHu+8L/8t+n5fOJ8DOrvOX33DDMVnEJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676411670; 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=kOgXDxNkhz1c4XJVkhQYIqjmZkDgqmKVNbNZnu4F0qk=; b=qaJUGZp7/K+kWYNBoWoY+OjHzRBRE2LFo9aTD8pFJ5TErqP0aG89xpsWOPzMcx1WbfjWvn hMQf1x7wG/XAHrcjX4YiO7d9pjlTVxGhBCEW7MV85gVyklkRPtYbU6dVSaM96M0HvUwF43 jQ1zvubGoLPrUE4oEOq5eGd8g03aMVoMgO32jjvcglK2JktNIM50kI3DWOI297iplE6YEf nMTKgFBg6MFQfQw6kRUX4S1QuTclYy9yUEcAaUQDbB9L5xwHnqy7x1IMILH1kMVCkDZfyv pguyyHd2AIXJaaXZMT4Sjd8QgKscTruZG02vOcox5s4Boc8IOE1zfPY493zcQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676411670; a=rsa-sha256; cv=none; b=jpaZxwrwqmLnFhm5hzqmVSKYohOOwEDQIJyuKx/XR06Pdh4MOLL/bCuzerx+3TC8Gzp1Tf vTrJlEk/8623P4ObL7Ofikd2P4uV448W6QBp5rwlpPGXmnfo8hfV9JE8hXUUyImmKjOey5 jfUZOIc39PY4FwPRsuE2kPhSI7jnZrIyFqcijV/4a6vjBE62fMeVw3mjrD1KulJUQq4E4/ fpYnp8M6wtHQBfo27bL9j8Fk5W4rijAUTGcFNdZo7gH/lsXjy3IcTMuMaV28UIpkse7okH oKNtouX0rLJrJ6mMRTIH3eIC9TgiGur9MHMhRcrEcUWRC6GFzhh8h31p18KZbg== 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 4PGZjy2Qy8z1Dqs; Tue, 14 Feb 2023 21:54:30 +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 31ELsUes088219; Tue, 14 Feb 2023 21:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ELsU2p088218; Tue, 14 Feb 2023 21:54:30 GMT (envelope-from git) Date: Tue, 14 Feb 2023 21:54:30 GMT Message-Id: <202302142154.31ELsU2p088218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 364391a9bb5e - main - krpc: Remove VNET_NFSD #ifdefs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 364391a9bb5eb85af5f711a952ba40a4b1f768da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=364391a9bb5eb85af5f711a952ba40a4b1f768da commit 364391a9bb5eb85af5f711a952ba40a4b1f768da Author: Rick Macklem AuthorDate: 2023-02-14 21:53:39 +0000 Commit: Rick Macklem CommitDate: 2023-02-14 21:53:39 +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. MFC after: 3 months --- 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);