From nobody Thu Jun 5 02:00:30 2025 X-Original-To: dev-commits-src-main@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 4bCSMg24Jqz5y0ry; Thu, 05 Jun 2025 02:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCSMg1CGdz3X9c; Thu, 05 Jun 2025 02:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749088831; 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=w2zyMt1QVI3iAbv00yNbzRFsS8VI5VSDudDMPbL8pms=; b=LBEgfK+6h9qTLqzoe+0mrfVKteofKe7SoMjIl1yVH8g7HwNx5NLTrS4KfXegM5ZnKXIa1r CL7KLAl855VuvBGD1r2n7agguNT2YmyyGB3ZIShwjCVhXMSPbnnJFkLhtparfYIo1gPZ83 xQ3zbiBPy1JYVJK8emraCviO1lNCNC2qeyt+d/27RI6uE3srENWuj+cqYKsnM85YOdJWD+ xX5XZzz0Y4QPaQ2tBzoV0OKTwklA4SLC4lHKdErCHwxOkk2TF91L9NkuMfzkutCY/js26C 5rAC+I/30B3DHTk43A6B6rP8Liw1JPxmJ7G8Xg5A043JTgxXdjHbsDKwI0cxUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749088831; 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=w2zyMt1QVI3iAbv00yNbzRFsS8VI5VSDudDMPbL8pms=; b=hsqLQ+qjSso8+UyKyFv/2uaXlPpTOajnLt38njuln+Lh9hrRIBwv1K0naVirpdN1EmaTVi fNtTYWfnjsH95S2t/sv+4c2x8Up9E6CTHkT94Gj3d9suOWEUjlTeptZrJvSQPHvZW3wRGu SWmDXSzB0ExSLQjSoOuzfg+X5XJA2ckFRnoa0EQp81FHzaSDgvdp/FLK2/IkKYiEcxsnqf ifu52B2a26uBvUgTdl7mZuE0Z1nZMKL/C9tGrOJPmry9/hf61sVOzK0m9gdTl+Hxpcv42j nBFXQ4+5uR/J9a4BD9VTelYRmSVhb52fyPnWM+ebName04LCMhL6KFzERpwgQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749088831; a=rsa-sha256; cv=none; b=FKqw12RXlviOlEHuuXfAe/urVIy/dggNFlRgXgNUlAbf/qdsGr/z/bcAa/3fcWkWf8wygH HbdawTQG6OnymsGOFkzLW4RqBrM62QQKiDwSzrQKHAf2wZ18YRhSND/WjepSzvLHKysuWX XMDlq9kgvTn635HcTRmaqFBIi/wTvlZ1Bi/AWmubFultpBULKXwvshlberpoul2mHGZtp9 pn3zUiXeLraBDYypWGFKgtyMJ6ji//ZAZAl/YfVgyLA7mvPAJFAAI0SnEosYiDSvZWgajq GckbPShz2EjAUyxJ6PVRNp/LUUNrv3xfPdS4bYyH2nHUZvJ3OJcKjhU7HZLlVQ== 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 4bCSMg0czpzqCg; Thu, 05 Jun 2025 02:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55520UBd042385; Thu, 5 Jun 2025 02:00:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55520U2v042382; Thu, 5 Jun 2025 02:00:30 GMT (envelope-from git) Date: Thu, 5 Jun 2025 02:00:30 GMT Message-Id: <202506050200.55520U2v042382@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: 4be12de1d630 - main - nfsd: Fix the build for 1749465947a8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4be12de1d630383ab5e0c0f3ff48aa9f2f192ab6 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4be12de1d630383ab5e0c0f3ff48aa9f2f192ab6 commit 4be12de1d630383ab5e0c0f3ff48aa9f2f192ab6 Author: Rick Macklem AuthorDate: 2025-06-05 01:57:07 +0000 Commit: Rick Macklem CommitDate: 2025-06-05 01:57:07 +0000 nfsd: Fix the build for 1749465947a8 MFC after: 2 weeks Fixes: 1749465947a8 ("nfsd: Fix accumulating nfslockfile structures") --- sys/fs/nfsserver/nfs_nfsdserv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 3f43e9115e28..88f812548445 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3118,7 +3118,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, tverf[0] = nva2.na_atime.tv_sec; tverf[1] = nva2.na_atime.tv_nsec; if (cverf[0] != tverf[0] || - cverf[1] != tverf[1])) + cverf[1] != tverf[1]) nd->nd_repstat = EEXIST; } if (nd->nd_repstat != 0)