From nobody Sun Dec 17 21:13:57 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 4StbKx3C23z54GP7; Sun, 17 Dec 2023 21:13:57 +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 4StbKx2c3kz4SkG; Sun, 17 Dec 2023 21: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=1702847637; 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=09TZuvuj76VUR0rUbz7AUl4UXy2h+OCyyoxVQr0DlAE=; b=e1YeAjZl0kl9OhqDLMTKaDKoB+yqoAXIOKoKa1508X0ODUXqn6cvs5tUZ+sL/YYrVQH41D APds6IFfgzMjMaEdc1h5VgFCdfH5EqbvZ73S9uQnW1g3ucg96+RxRYk6AmDy61aLis60m4 WGM9oh0qBgYQ2JG7Mhm+Boh5aXdxybxarP/Zx/nwnOXvOkCx7ABS58W/Khgz7gSSj/ho2a GTf+8H7VxscPiJY9pQiJM3xoX8LJqonrYtKszqQ8Qnmpwsb0rOK2P1IFeYyvzNUnwZiofZ wUHtMN2ztppth/ckh1fCs/5wirr91/D14tMcW4R123jUmFadVYhl3vsAQXO/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702847637; a=rsa-sha256; cv=none; b=w7QX1u3n7Dnmb0lMUTJYy45Mgo9iWewOcjDXCgBpk9lLpnmZC4RNwjA/JLQGOUsuRHBhpU KPlf0KG+7fFGzdbT4LVwU7vIDVuDvuuz2uQ33QFCkXADSLWJ38ytAuvKfG9AFkvIiMc1+y 7zBmOASmWRqLDqHOiW05oh93pB5aKszN8nIz6ZvschORfwlhK8ZUOB4nzmuVq+6KcIzWx+ RnfbkuvNEpGBIewqsiyzgXkrNQAdI8WUXJ2YBZ8xNKVQX6yKeH+XwGvHqXUGNJedKsvart ZJfx+pldJ5Wot8u7spEfy4hYrCIS6/JU0k32wFYCW/2ktOwMBMHMPbZKkHzgYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702847637; 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=09TZuvuj76VUR0rUbz7AUl4UXy2h+OCyyoxVQr0DlAE=; b=K2mE0yUcsu9s0Rs3P7oHz1Doq5gGOV/CfPYWj42c5vdzE7cYuvVGcJ5qHGxD4bWSakYea1 Q3hMcTmyFvH9P6s5QQsK0nooibe0Lm+7YvJGaLGHZULl7qJu9pmnQdpYl5yp5OKN7FyNCb q/qoOfkYxmhE09cRCATDl1589q6/Ejce1XkdelcScTPClpoTVvKawntVvpdqzNWuCIKITf qQjm7z4CGzq0dTl0iKC+4koy1dfRwqFSrquSEW3s8GOL8sibY9EZ9Ls6x3xCXjuS+yJmWn 3nvMFVVFDzkygOP/jDm2UV10PVJ3RQ4ZM1nb7D/OdUk2Op0+Ds+4Yte3qy342w== 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 4StbKx1fs2ztJc; Sun, 17 Dec 2023 21:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BHLDvaf077352; Sun, 17 Dec 2023 21:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BHLDvUV077349; Sun, 17 Dec 2023 21:13:57 GMT (envelope-from git) Date: Sun, 17 Dec 2023 21:13:57 GMT Message-Id: <202312172113.3BHLDvUV077349@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: dd6bdfcd073e - stable/12 - nfscl: Fix processing of a rare Rename reply case 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/12 X-Git-Reftype: branch X-Git-Commit: dd6bdfcd073ee8461c7d5a7a8fe336831a57b685 Auto-Submitted: auto-generated The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=dd6bdfcd073ee8461c7d5a7a8fe336831a57b685 commit dd6bdfcd073ee8461c7d5a7a8fe336831a57b685 Author: Rick Macklem AuthorDate: 2023-12-03 23:31:01 +0000 Commit: Rick Macklem CommitDate: 2023-12-17 21:13:01 +0000 nfscl: Fix processing of a rare Rename reply case When delegations are enabled (they are not by default in the FreeBSD NFSv4 server), rename will check for and return delegations. If the second of these DelegReturn operations were to fail (they rarely do), then the code would not retry the rename with returning delegations, as it is intended to do. The patch fixes the problem, since the DelegReturn reply status is the second iteration of the loop and not the first iteration. As noted, this bug would have rarely manifested a problem, since DelegReturn operations do not normally fail. (cherry picked from commit 6aded1e6b2e5549120031032e1c7f8b002882327) --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 53e3ab9b03ea..0a9c54ce5e1e 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2550,7 +2550,7 @@ tryagain: ND_NFSV4) { NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); if (*(tl + 1)) { - if (i == 0 && ret > 1) { + if (i == 1 && ret > 1) { /* * If the Delegreturn failed, try again * without it. The server will Recall, as