From nobody Sun Feb 12 17:19:31 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 4PFDjb6JC8z3qNWH; Sun, 12 Feb 2023 17:19:31 +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 4PFDjb5gSQz3PsX; Sun, 12 Feb 2023 17:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676222371; 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=IDSEQxzWiALEL4DSu+dcpVhnzsyz/+OI57WSYhJs8Vc=; b=hcstsU07gwXMGq8Gb3X568XGKAnXB8LpeW731L2h0tx9AIXPApinDjpd1B0vWuAEEoOUUC n7IMhVWuc06CfGNjDDL8P0VFiNo6Ap0puESQt/Ua6uNpfI6tIl6z/FKocv3iqSHCLSa8lJ coTwsAeLfcU2gpPe7AL3Ru9yKOR7N/mihxHg8f7iM2OsfZIoGUNWThLvhWYrwtcdmb+0/m pWyG0XDJxhbGa9kcB5UcSLfiJKjfUG66ZID3ZyM6uBpAaWdjIXQ5BLLRN7pKRrMKglCf7p 5ycsLCvu2Pwi3JbekFsyISzkNL0bIfP5dbO3piK5HRZnVfHfiFAQBggxRY0BgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676222371; 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=IDSEQxzWiALEL4DSu+dcpVhnzsyz/+OI57WSYhJs8Vc=; b=wg8tZm63282Tr8GaixU+nJyqbg3efXHTBX2gsS9lsFGjEacBFs/iOddh/EOv+xkThfvoeO inBZh0rkEvJ9EZiAjtSVRpi0N39kKQcK4eSW9pGS94mApeKVdjc76Tbig8wedG9BKPbU/x f3t3NJwrqNE+Y86JaVhpmegGFfH/mhpfOHbd9UWHEXLkAIte6IxiruZprvTCNAHLlGoI+6 tNewh7WVm+fJF/nn3KfIT7vwQ8XI6Lb9CvnsVJzlGZ72aQ6TG9ojtDyYW9AffB6bk2AotN fKN2KrpaAgJMwAg6f7MNGkayf9NTK6ld7nb57QaJmlI+8wu6bauV/w+7itxoAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676222371; a=rsa-sha256; cv=none; b=veFcBbiT6dah31jWI8pZms2jlTJv//ghbGyFpBdebpmvJZY7CsoKlABS7upq6yy8rUxJGz jr0faRy8mcpQV88dvhFe+N70pYlg6oD2I8Dsm+kj9VKbzs9uQsUq2TrXGJwwvIBnkliAlc CFn9N7z3fl9YFsDCnsoOgjoQ6b4/sg3ATH6TrMHlwlpHD4oE163ze5S29y1buVPZV8jI1J dmTBR+MZq0m/vjBsM8eXzcmvLy3WmxdZ3jhfbMG2HErWjH1qWwUz4W4b6n6cFIEvn0Bz/M fOk7U+uJtFAWur3hJQHZQKh31FUzACFLNcpwdwtgGSgigOxI1Zt47VORE9tinw== 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 4PFDjb4cSRzmV9; Sun, 12 Feb 2023 17:19:31 +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 31CHJVdc069086; Sun, 12 Feb 2023 17:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CHJVeI069085; Sun, 12 Feb 2023 17:19:31 GMT (envelope-from git) Date: Sun, 12 Feb 2023 17:19:31 GMT Message-Id: <202302121719.31CHJVeI069085@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: fcfdb76e12fb - main - nfsd: Fix initialization broken by 7344856e3a6d 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: fcfdb76e12fb3cdf584e6f06e56e7c48ec475cc6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fcfdb76e12fb3cdf584e6f06e56e7c48ec475cc6 commit fcfdb76e12fb3cdf584e6f06e56e7c48ec475cc6 Author: Rick Macklem AuthorDate: 2023-02-12 17:16:56 +0000 Commit: Rick Macklem CommitDate: 2023-02-12 17:16:56 +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. Reported by: olivier MFC after: 3 months --- 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 696af8a0e409..45459d115346 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 834a6b069899..bcc49f8bcac3 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3532,6 +3532,7 @@ nfsd_mntinit(void) return; } NFSD_VNET(nfsrv_mntinited) = true; + nfsrvd_init(0); NFSD_UNLOCK(); if (curthread->td_ucred->cr_prison == &prison0)