From nobody Mon May 15 23:45:46 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 4QKwwp4Qd1z4BFy6; Mon, 15 May 2023 23:45:46 +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 4QKwwp40XSz3M2g; Mon, 15 May 2023 23:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684194346; 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=q/zcru2bTExZDJ9+x1bFLC/KikXZ/pGJnKhMnxuDlys=; b=jOJmGgXeo5Unk3FlgKvi5noGmeJ7vUs4TIiqNr3Qqf2gBuuJMNoFT2+q8WZ/7rH+Wls2fK 3wxdegLjaAfm0Yoqc5HPlMxBSN/3dYqjNqQbEoNdlxlKUh5OE3+81+Ymq3vBeiXfY5Dr7k kGx32ZCoos4LZGFe6dMi4bZPrclmI64CnO8liv9wlj2wYrMh2/Ye8x5RJS4iRaiNEnxwVQ 70rRaZ56YlmOWypnu9jjVU9TsnO0K3R5McYdblIaolDltK8shwwWkfV23MlRwaZw32TV5n QLrzzRYN1mfvJQeFGzNxX8+ctGBEXTASxLVX9rwd6HMRhJjKyfqQkqc21MraAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684194346; 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=q/zcru2bTExZDJ9+x1bFLC/KikXZ/pGJnKhMnxuDlys=; b=GcKToLSFSXPFYAZwUHAoyEmJ8Ek2RmmnbFM74jB7OLgUHOK5Hf1yYKoP3qgb8GfCofBanM 75U2AxiZDzq5vvIJ/iEPKF1psL/n3OdBfvx4ZjJb7iScf1qblibBYRQbW3Kq9gxhEn7ERO SGQ7R9kGkOvk/ltR2/izUvnB1r0eZDLBB4Fzf7QcQRNT42UkJR0gSaZbs9mXDFGOwM4PLI ZopUz7z2Tm1ILJ/dQS3Nf9WuyJgKtiuQESwFrkrLkrdkpcDy5ixw4cXnqsc78cpsv7tU2A lloxVyhIqWSZJ7cjrrwCtQ2KL0kTOOG8WPfPxs53/4TL6dTwvr+qVCgG5yHTPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684194346; a=rsa-sha256; cv=none; b=PG4b9bCoCBljtrhQnKQ+f279FmfPo0IpEJyDKN1xF/yzZK5SMswp0j9cwmIC9Y5Qtxlqtj mOfRcvhH1sY77L/CpA6wlwgrqyZEUyHBnZdqJbHbVjLIZnqQrMV/xeOHzQaQLOuQPiOAl7 nwoXGG7BK1Nsv4OPJBPiViVxUUCPS+R/+8GbvK+BmR+Nrh3zvnsEiOx7PSx/2Ogpan1nHI vz3rrCSDyGU8txhnQx9yoscT55ZZuj0rtM0Y8prg+0NwJSOoYmRlAw/hCHC2+Gtzk4rwov qJBO3OZJPjSLpi7paXKSKZk9Go35olGv3rgVxWzyHS4T1VXgwilUQ2Fb0V76EA== 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 4QKwwp2n6Qz10rx; Mon, 15 May 2023 23:45:46 +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 34FNjkLq063020; Mon, 15 May 2023 23:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FNjkj2063019; Mon, 15 May 2023 23:45:46 GMT (envelope-from git) Date: Mon, 15 May 2023 23:45:46 GMT Message-Id: <202305152345.34FNjkj2063019@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: 797b9a88c80d - stable/13 - nfsd: Delete nfsrv_prison_cleanup() until vneting enabled 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: 797b9a88c80d18c53b613dff6ab478bf88022eb3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=797b9a88c80d18c53b613dff6ab478bf88022eb3 commit 797b9a88c80d18c53b613dff6ab478bf88022eb3 Author: Rick Macklem AuthorDate: 2023-02-12 02:27:59 +0000 Commit: Rick Macklem CommitDate: 2023-05-15 23:44:44 +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. (cherry picked from commit 4d68605f31fb536722529dc90f16cc47d964882e) --- 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 a58df7b69420..6be29f563ec4 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); @@ -3699,18 +3698,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 */ @@ -6918,7 +6905,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); /* @@ -6988,9 +6975,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) { @@ -7007,8 +6991,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; @@ -7023,7 +7005,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);