From nobody Wed Jun 18 20:13:57 2025 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 4bMw1L0xX5z5q6C1; Wed, 18 Jun 2025 20:13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMw1K4Nyzz3ZFB; Wed, 18 Jun 2025 20:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750277637; 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=eXzNecR1nGsKHA8g8R54V82ljSSTnjqNI/wBcNCbwwc=; b=XwORiVyxC1q0/0/2DhPSHDgh8XCZwwRDoSClfwnOkxr70rMOQyplqnYM3YDizEXycuQWFn OpndVoQIcEChQgXfQFon12KOc5KP0TqiJReoxiHAct/S3DXxpGfqi4/w5TksotoMEJ8Et2 SIDFbPKVswGD+KgrlgSdk1bnI3i/U/S0F/h4jCkxmmPKQtjwzD2GYFHaLBuUVMys7dkvN8 Riiumi8QI8RbjoiwS55bDeAzOhziKofAOiX+n9qMgOzXHKG54vtTt1d5n2VPljBt3QXmTf 3JRfMFO4Aj2+t2zvBr5Rs+2fDkGy5x5qQLMgBDWk/izP/TnczgxjI4M6O5oO/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750277637; 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=eXzNecR1nGsKHA8g8R54V82ljSSTnjqNI/wBcNCbwwc=; b=GyPszzIhcWibGF97/9hl+7KpZNUzaza54v5L3FiG4gBZ3TZgHr8Wi2c/1iluFHe3DVV88W uqSwW9GuJmOvLqG97WgGElmUY9xyLI9Tda5pJDpTtuYlZGunZyxrwzsRg4KkcJG0/wRQ/B Uf5E1pj49cMsohxR6A08lgw33Kl22PlPDkeT+QdbMh7A5GchPDdGGY7HryS7WqBNZnMLu5 UDLy+QmeHnO+8v/9Zkd32vFA/QhyEemykoNGm5uy9nWwpfDDZqlDEQhqh5yBWYMWeiNKip 9AvlG8WzcwSyiSn+ADiQ8yEtXxARCxOyTWwAzaz8AnjnDvmqVchlJWMAPGwgQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750277637; a=rsa-sha256; cv=none; b=AatjpOM6TV+m4iDK7bXaPlTKJx3Xz+sUqnuTlqf5FiIwNDeHxrifLFChEWfD8+YI6jzWG5 kjlH4FssVYrEPTvsa2DS6HcCFBfvzUgbOCCtIF12YV8Ea1wjIIB6BYRzDZ6WfuwUHWFUzc hRyiwwj7BbCgqh9GNEMU1BSwkGXEf/Yci3ptFsAlyfB/lUml9FIQ/bkyPMTlV8/mvLIUkr xmM0WR/FA+vStpXJLm8lIa2UxkvSH0afoczeAY05BGUC8adey4g1Po4MTCH9HgMq5Rao74 Riyt/3Hohz6jMz3fUYBg2QDEHZIFtYhk948Pr7F6YzcHAn9LJqUci5ydAWOBAg== 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 4bMw1K3pSwzlC5; Wed, 18 Jun 2025 20:13:57 +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 55IKDvvX055550; Wed, 18 Jun 2025 20:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55IKDvGb055547; Wed, 18 Jun 2025 20:13:57 GMT (envelope-from git) Date: Wed, 18 Jun 2025 20:13:57 GMT Message-Id: <202506182013.55IKDvGb055547@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: ca5be69fb96d - stable/14 - nfsd: Fix the build for 1749465947a8 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: ca5be69fb96dac9eb005154fd0702731e5f45b08 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ca5be69fb96dac9eb005154fd0702731e5f45b08 commit ca5be69fb96dac9eb005154fd0702731e5f45b08 Author: Rick Macklem AuthorDate: 2025-06-05 01:57:07 +0000 Commit: Rick Macklem CommitDate: 2025-06-18 20:11:26 +0000 nfsd: Fix the build for 1749465947a8 Fixes: 1749465947a8 ("nfsd: Fix accumulating nfslockfile structures") (cherry picked from commit 4be12de1d630383ab5e0c0f3ff48aa9f2f192ab6) --- 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 7ac5b61b0ae9..846d4037ef27 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3087,7 +3087,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)