From nobody Sun Feb 12 02:28:56 2023 X-Original-To: dev-commits-src-all@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 4PDry02Sxcz3nqTv; Sun, 12 Feb 2023 02:28:56 +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 4PDry01vThz46MJ; Sun, 12 Feb 2023 02:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676168936; 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=thE1DPwYxhRmy+OeGVRQxp7t/NchYxhPYwl4LnOsztY=; b=ac7w9zKEpxglMTtV1/G8G3u2gIuU4b6+lIm/oyLxSNBwObUbmqkxTL2DGbHtveSuS35t9y eb4MlW68LALAoQpVgpkRfwTC/JLn5NJELbEp+8hERrurGeNSVKI3J0bL5RPXJvPmAWJCBf FeC4Tw4s5i8RscdUU3+A21UCamrlAr4yxDQtrcRqu5qL+QSlIEydd51AIzBeWg3ixojyqr v+VFlOvvrTYc8lWHHQvmhJuTeNZSUuu+Hrq1n2iXckJMNl3G5T7cvYg/7KMZAgmbsd/1Ua t8dLdSv93t3KhZSyIRKwntXXlQ7tDUTwk7p6JsifHNc1tE3aal2ooGnXjIm5Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676168936; 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=thE1DPwYxhRmy+OeGVRQxp7t/NchYxhPYwl4LnOsztY=; b=MqfY5o0NHhuF8jMNrHntMVkxsSacuq0K63+oJmctw1WgOOSuSos6nXqtMv35FfxPtHGMHo q4nVu0mPWg0pabK3bKXTyoKER+QJJdEbsmoBBERj8Gey94YgR3ru8IDkw59IZSBCRzouiK G71D7b9Vf2WmwMaxF2mPGaFx0szfvCcCwJcvciL2WLoLz5HMmUokufsW/jAcAHTUvcv2nY RotcbPv40riTU4zxzEnLtc4qzAhzKSFtixdpaYu8mb9TD6ZSYbMfa3a+RA+ZbqZRuxSMtS Nu1JQQymzJeQKOZOoMSSovIMd1lnNr3+OzLFsPJcMMpPPuxqzWC/r7JilzVbbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676168936; a=rsa-sha256; cv=none; b=cBfk9RVYRM7YYxcStFcMg/Teuw7ZQC4B3EhDeKLRoEX6BeGDl8i2A/XMXBxavLorOjewV3 VEbUU7HhsOmar239ZCAT623Z9m4f0+Lqwt/5BzdGpfTrpEExJa8gmsrF3l7IlXL+FYN9E+ wmcLuj+V2/CrhIh1vldbtWpfSfXYiPwlZn2ZqSHDvJuqvwjBDqPo3vPH+SU1SFFs7al4su rRMOOmvRs+f9YdP50IoZVIItlSUTQbOAfI23+RyW4V01d0ANIYFrRDni4q3I0fIGKi9OTJ inl6Mwt3MY/g72MbZHZ3euLc1bdg010O4WJ9EroZivzo5lCFUsVX0OvE1xNYkw== 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 4PDry00y3NzMKc; Sun, 12 Feb 2023 02:28:56 +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 31C2Sus6099977; Sun, 12 Feb 2023 02:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31C2SuxF099976; Sun, 12 Feb 2023 02:28:56 GMT (envelope-from git) Date: Sun, 12 Feb 2023 02:28:56 GMT Message-Id: <202302120228.31C2SuxF099976@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: 4d68605f31fb - main - nfsd: Delete nfsrv_prison_cleanup() until vneting enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4d68605f31fb536722529dc90f16cc47d964882e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4d68605f31fb536722529dc90f16cc47d964882e commit 4d68605f31fb536722529dc90f16cc47d964882e Author: Rick Macklem AuthorDate: 2023-02-12 02:27:59 +0000 Commit: Rick Macklem CommitDate: 2023-02-12 02:27:59 +0000 nfsd: Delete nfsrv_prison_cleanup() until vneting enabled Oops, although the vneting macros do not do anything yet, commit 7344856e3a6d enabled the prison cleanup function, that would get called and crash the system when a jail was terminated. This patch gets rid of nfsrv_prison_cleanup() for now. It can go in when the vnet macros are enabled as front ends to the vnet macros. MFC after: 3 months --- sys/fs/nfsserver/nfs_nfsdport.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index af5327bd5a2d..834a6b069899 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -94,7 +94,6 @@ static char nfsd_master_comm[MAXCOMLEN + 1]; static struct timeval nfsd_master_start; static uint32_t nfsv4_sysid = 0; static fhandle_t zerofh; -static int nfsrv_osd_jail_slot; NFSD_VNET_DEFINE(struct proc *, nfsd_master_proc) = NULL; NFSD_VNET_DEFINE(struct nfsrvhashhead *, nfsrvudphashtbl); @@ -3687,18 +3686,6 @@ out: return (error); } -/* Osd entry for nfsrv_cleanup. */ -static int -nfsrv_prison_cleanup(void *obj, void *data __unused) -{ - struct prison *pr = obj; - - if ((pr->pr_flags & PR_VNET) == 0) - return (0); - nfsrv_cleanup(pr); - return (0); -} - /* * Nfs server pseudo system call for the nfsd's */ @@ -7123,7 +7110,7 @@ nfsrv_vnetinit(const void *unused __unused) nfsd_mntinit(); } -VNET_SYSINIT(nfsrv_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY, +SYSINIT(nfsrv_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY, nfsrv_vnetinit, NULL); /* @@ -7193,9 +7180,6 @@ static int nfsd_modevent(module_t mod, int type, void *data) { int error = 0, i; - osd_method_t methods[PR_MAXMETHOD] = { - [PR_METHOD_REMOVE] = nfsrv_prison_cleanup, - }; static int loaded = 0; switch (type) { @@ -7212,8 +7196,6 @@ nfsd_modevent(module_t mod, int type, void *data) vn_deleg_ops.vndeleg_disable = nfsd_disabledelegation; #endif nfsd_call_nfsd = nfssvc_nfsd; - /* XXX-BZ OSD to VNET? */ - nfsrv_osd_jail_slot = osd_jail_register(NULL, methods); loaded = 1; break; @@ -7228,7 +7210,6 @@ nfsd_modevent(module_t mod, int type, void *data) vn_deleg_ops.vndeleg_disable = NULL; #endif nfsd_call_nfsd = NULL; - osd_jail_deregister(nfsrv_osd_jail_slot); nfsrv_cleanup(&prison0); mtx_destroy(&nfsrc_udpmtx); mtx_destroy(&nfs_v4root_mutex);