From nobody Mon May 15 23:47:20 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 4QKwyc3ncQz4BFKy; Mon, 15 May 2023 23:47:20 +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 4QKwyc3HCHz3MKt; Mon, 15 May 2023 23:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684194440; 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=3+96qqdirmau7VXauBz3Bg1oKjv8NyqG7zSyerNx1Ks=; b=PclJjJKkbtZCbbdc7TOxklw/JVSiy5qQDgN6WioEWCnRpw/PkKU7hVGsIHP6UNk4IdEtQ+ Nj1ldnLt/f4lWcSZeXlTAXKcdyCYeAf5BUrOJHQQmeb6I/1fE8zrrHxUA9oxmMNQLIEd5F RDN5/1ckDwHo1Ax2Qk45D61WMZOwGOuOB4pOHxeMAz7ax1FtzjU8+f/iIzOq9/H0bMpcoh pa/ZhXEEYT0AzDuZNOO8ZUxjAO3snFHi9wsiVqgo28fpJYZ0UTFc8D3NhWFjh13e52Z/yo CabgpeAa2cEttDHA4k+vaQeeBrwHg3e5UBmHo2WK+uGmSbQnAqjoKsR/7F/MuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684194440; 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=3+96qqdirmau7VXauBz3Bg1oKjv8NyqG7zSyerNx1Ks=; b=NaVqWu2DKkLlj7bMRSTESE0wP9iZI9Bcsk1dfgVypQ7BgaebLz/r2z1NAyr+lBj1ed8pXN KFd9fjaQH4BECs916FFDiPR7GnS714Hz24IDEiVAOioUsv22urydUbN5lgMhAl/qR1dpsG 8GRXAQFN+Izp/PC04ROq2y9BkJ7ceTb+AJCSRAo7EUmv10UnLqbhfYbXB9dfdFY6bG8Kle 9ezqxa60D3GeszE3n2sHfl5G+jghHz6nHtZilnvsvzdI0dZkaofrae+VRPRfRYF/R18ipW 7HwYUmePj3sfd0Gr05+Y4zAEDGBKXN3ncl0aC+c2NWwS0i2gIiOS9RZI3st4aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684194440; a=rsa-sha256; cv=none; b=bqS50NWYE+LaPHU3TyO7wCna001doFGZgkpttfT74eBwXBNFA1SMMiUtCnEFloZgwnS/JF +TFrQLtUbbpQfJYBn9/jPMiU/bpNn/211udj//MGhXnep6/mvymVYZeJj4gA/6neomnRuq HCkjj9dYS5UACHJalwg6TRcV5axFoBmet0HDO8AUBy9CBfLTi58DrUlHwpp3gVC9QZLEwU pAqfeRc9LNwTHl1hSUcdqa6JlOW+2bNk5mjXiHDJRK+zkbg/mcpH3eiJ/Qf9hySaAXf1pI KT4Hh/nK+NSFMkUtThntQ5b/Zt7yA3lTDumtyHR7w4yd1WjVWTCkpUW4m0dGjg== 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 4QKwyc2LWSz10qJ; Mon, 15 May 2023 23:47:20 +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 34FNlKOY063299; Mon, 15 May 2023 23:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FNlKv3063298; Mon, 15 May 2023 23:47:20 GMT (envelope-from git) Date: Mon, 15 May 2023 23:47:20 GMT Message-Id: <202305152347.34FNlKv3063298@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: 764664aaa5d5 - stable/13 - nfsd: Fix initialization broken by 7344856e3a6d 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: 764664aaa5d547b58db321c40162eced7fd4da7a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=764664aaa5d547b58db321c40162eced7fd4da7a commit 764664aaa5d547b58db321c40162eced7fd4da7a Author: Rick Macklem AuthorDate: 2023-02-12 17:16:56 +0000 Commit: Rick Macklem CommitDate: 2023-05-15 23:46:29 +0000 nfsd: Fix initialization broken by 7344856e3a6d Oops, although the vneting macros do not do anything yet, commit 7344856e3a6d did change where things are initialized and one of the initialization functions was not being called early enough. This patch moves nfsrvd_init(0) to the function called via (VNET_)SYSINIT() to fix this. (cherry picked from commit fcfdb76e12fb3cdf584e6f06e56e7c48ec475cc6) --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 1 - sys/fs/nfsserver/nfs_nfsdport.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 7b0f84c397bc..ca4d9f910562 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -531,7 +531,6 @@ nfsrvd_nfsd(struct thread *td, struct nfsd_nfsd_args *args) */ NFSD_LOCK(); if (NFSD_VNET(nfsrv_numnfsd) == 0) { - nfsrvd_init(0); nfsdev_time = time_second; p = td->td_proc; PROC_LOCK(p); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 6be29f563ec4..d62c6295ccfa 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3544,6 +3544,7 @@ nfsd_mntinit(void) return; } NFSD_VNET(nfsrv_mntinited) = true; + nfsrvd_init(0); NFSD_UNLOCK(); if (curthread->td_ucred->cr_prison == &prison0)