From nobody Wed May 24 02:13:42 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 4QQvqp3psbz4TLWR; Wed, 24 May 2023 02:13:42 +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 4QQvqp399kz3JTX; Wed, 24 May 2023 02:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684894422; 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=SX30hkh0Ss4518bSw+w/DXJMX4eN6Mmi6hSll7e20GE=; b=KNEz6OTGWP1TtovPPOzN5qAobiPNwVy84Y9FAbRKnh0rJD14Mq3+tgQ9EzsYFHDTRooOni Bvd7ViO6c3LPNMQaE4NuG54YKHJYE4b5AnKZ0iAeBRMAj23eZ5+qolTCrnh91LSN9ecwxu 1va8tp+wbUxKI6DgtI2PaL/doP+y8rgkTsK3jtPZcghbRvpTuakO0ggMkCcOMNfTEgKtEo 66g899IdI3oTJaHqdhi7KoVGEGQ9oQ3rNRTsru+GC50fkx2UrG1pIGiVbHr9hp5Mtd3DVS s6JJYK/V95PLgEzZ+888HL6pCaDAXkAflHPlxB5DwIyohLLVV6JK6yTUjJF22w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684894422; 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=SX30hkh0Ss4518bSw+w/DXJMX4eN6Mmi6hSll7e20GE=; b=KsSbM6RyKgub/cvEj/DFj6f1D8HigxYzYUN8OYlONTROoth7m2H68iViD1xoV6aCV5CisD L1bltRkdnY8pxnQoSAULM9EaYMyErkw00oeUTKxPC92+D9zsye38PyJ2/UCYI4/9/oUCam 1ZMqqT8oQYrbVIYYusQkq5mvMzuKfIPSitxIKw19jVWwbN9MoWQb9SOwwCRM6yqeZ/RG4I nG29qrMG1FJLyp8Mu6uubpcavV+767A9ZFaXCCj86P+WdFG9uolLaKMrs439A/9wI7Xb8L wpJrYS7ZOI4KD3IIzo3Ep3VBPP4mpk6u8zYE5bqkplVUJTVtblJnCPSLfL9GnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684894422; a=rsa-sha256; cv=none; b=btUp3l+TerxCAfq7KcTaeYFl7cEk0FBw9Pr0589ZDXCfP4tl17xm3noydz4MohGixgN92x vfrkJm8tXe/6RpQYDcYm/xUFTnXyZ3e/+W3DbNeprC09P3Vt3Idg+cYaKEzdM1yYxlCiQC rooZB18eTbCdVnj8La7V+bn6YGPOfd/b3Cw752wx2mVerpxmrFFUHh0F8d+QPwAV5ySH/A DZyrEHwLDdJ+45q/ymzFWUlKnGWdzS8sKSOlzh6d4MxlLt/AWVvSjium+mUCKRCKv8kbNE vrkdpv5hx62dly2f0OJ94r3io6Q9gf5ceweSEKEL/6oU1FN4VBge6hHWoB3CaA== 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 4QQvqp2CySzPBX; Wed, 24 May 2023 02:13:42 +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 34O2Dg5q084469; Wed, 24 May 2023 02:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34O2Dg3u084468; Wed, 24 May 2023 02:13:42 GMT (envelope-from git) Date: Wed, 24 May 2023 02:13:42 GMT Message-Id: <202305240213.34O2Dg3u084468@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: 4ce0e24735a1 - stable/13 - nfsd: Return ENXIO instead of EPERM when nfsd(8) already running 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: 4ce0e24735a1619f54a22b263518e671256aef7e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4ce0e24735a1619f54a22b263518e671256aef7e commit 4ce0e24735a1619f54a22b263518e671256aef7e Author: Rick Macklem AuthorDate: 2023-02-22 21:19:07 +0000 Commit: Rick Macklem CommitDate: 2023-05-24 02:07:39 +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. (cherry picked from commit 10dff9da9748b0eadd2d02dded3afd2321d15537) --- 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 a5fcf58b3d9f..06e6a4147f30 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -4018,7 +4018,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);