From nobody Wed Feb 22 21:19:57 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 4PMTZQ2kR2z3sDF1; Wed, 22 Feb 2023 21:19:58 +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 4PMTZQ1N1tz3MsV; Wed, 22 Feb 2023 21:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677100798; 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=Trt2Dys3j9mMQqghPldwomiZn7u7gh6UUenBuY+Ms4k=; b=WS9LB7NXC7lpx5Hh5DGSVQDjn86ePlVVAoKSYFvuV77r2oft12lkweRPeQSLdXE39vPbhW +O9UDClkyaB6+J/sQuquK1lwl2s/Uk8FZXjd8QYJ8YD0Dqqcn6vhYCDjpp3EgPIV4PjYaN nl1/XrlYxCn/1Mq0mCZSi3wIpdSvKPDb7fqYs/14Q/RP+YnyXuiGNb8QHLJPb1RvecI+v9 uBRoWeCS0hD+IXFpeP/rvAa93a8xoSYHvEFE4lh9hZcoVfBpQo6vB4T4pSuj7UQyWGNJm1 mgXIy+KEK3kxh+Y9XLrhbSkdPj0CG9J7F+fzrFZSWLMHhw938yBjonJHaUAC+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677100798; 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=Trt2Dys3j9mMQqghPldwomiZn7u7gh6UUenBuY+Ms4k=; b=BV2399W7EN+B5GtyRbU3mmJyfOu0PIDDHniToqgsAs532g0KUAcIusMxb1Yiw7N3re/CfT LvZh/KSmG2JcOZ53W6oYiD/GiN5vw5k+PY7jDhyx+aJGfNUYQeYqLjdnqL0gp9YcBgL1ff CzrWMwxzHbONLMFIptSzaPLSsq+nr6B9MELidyPcYmLpkT2Mylz7HGunMJjfnI8c6C0xtR HeHGMlgu3DBfMcI6zf3yMZn7RGNdzOMA2Dgd56nZQpQKbr84yMSeOWfLvJHsSaSEQACpKy sIbeI6KZq1XpkvWJxvTfNu2kzSH+fYkVeFG4WqhLqNpW2+ZNKQxFxiLW8S7/Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677100798; a=rsa-sha256; cv=none; b=sjSGnE292c6CAQG/GPDEZlx5l6T9GxhfYUYs0yuoDAL8lichXqvRQ8ewUVgKRGLlQpcdAb pQBNxhatrz4Wr6XtoAUtNP6QanHFgZsAHlg/dR1FI3aRxz+jOhMUo2PMO8eeiFor0Ju4T2 qouNMNXoj+Ud/Fz9Gq0/UkyT8jPlN5/GNOp0VXyolCkakYPWxVLPpibLeab3atQ4k8kZve m+YJxLSo8oBFz12ouP3MdgIbpcYrp2fKNb4mChnOVU/sTAzYU3qbrbxtQhaI2MSlP920vH 4njPugXB3Irr9OWNlpEHh+QjdoUXdmUTvJpBulXEG4Sa/EPJ9llHhmeXCjx4BA== 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 4PMTZQ0PxdzGcV; Wed, 22 Feb 2023 21:19:58 +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 31MLJv34001759; Wed, 22 Feb 2023 21:19:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MLJvpU001758; Wed, 22 Feb 2023 21:19:57 GMT (envelope-from git) Date: Wed, 22 Feb 2023 21:19:57 GMT Message-Id: <202302222119.31MLJvpU001758@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: 10dff9da9748 - main - nfsd: Return ENXIO instead of EPERM when nfsd(8) already running 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: 10dff9da9748b0eadd2d02dded3afd2321d15537 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=10dff9da9748b0eadd2d02dded3afd2321d15537 commit 10dff9da9748b0eadd2d02dded3afd2321d15537 Author: Rick Macklem AuthorDate: 2023-02-22 21:19:07 +0000 Commit: Rick Macklem CommitDate: 2023-02-22 21:19:07 +0000 nfsd: Return ENXIO instead of EPERM when nfsd(8) already running The nfsd(8) daemon generates an error message that does not indicate that the nfsd daemon is already running when the nfssvc(2) syscall fails for the NFSSVC_STABLERESTART. Also, the check for running nfsd(8) in a vnet prison will return EPERM when it fails. This patch replaces EPERM with ENXIO so that the nfsd(8) daemon can generate more reasonable failure messages. The nfsd(8) daemon will be patched in a future commit. MFC after: 3 months --- sys/fs/nfsserver/nfs_nfsdport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 34b2f114bd7a..9c7169d7daac 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -4007,7 +4007,7 @@ nfssvc_srvcall(struct thread *p, struct nfssvc_args *uap, struct ucred *cred) if (!error && (NFSFPFLAG(fp) & (FREAD | FWRITE)) != (FREAD | FWRITE)) error = EBADF; if (!error && NFSD_VNET(nfsrv_numnfsd) != 0) - error = EPERM; + error = ENXIO; if (!error) { NFSD_VNET(nfsrv_stablefirst).nsf_fp = fp; nfsrv_setupstable(p);