From nobody Tue Jul 29 12:47:43 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 4brw9X2kWMz62xCt; Tue, 29 Jul 2025 12:47:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brw9X1pwsz3l6y; Tue, 29 Jul 2025 12:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793264; 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=d1KC8nkubBSx8eVDs4ReGtByjFc8IkQyE1k5V+qrkgE=; b=qOTk24mD96V3LgWcf9C4mDu4xxnDlOnRYanz+b73X7FxQhuTLMl3T3G8cPm4Kyrs2+q1lO G/smaMv7EKbuWtikiDgMLp8t6E1yYBhqtAOnXdsGqV82OWHKFUg2bzDcdItBPq7PiJUGe6 LjCq/dCF7MvKiqxvmZyhiG+jFu/Phtpbqfrr9Z/1qm0eIGwF3KGDt53R8noT4iYUio/M96 GQFae+6YRffJHdaw/M8pjp+NoFODMYzdrgQf+aODz0AEJO9DNC7bLoarF5p7LwzuDQ/O20 LIpp9rMA7RKgJq4d1YYBqwpU8GHuQplPAbLb33LLXl0EXgyjWdlvu5cT3B/8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793264; 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=d1KC8nkubBSx8eVDs4ReGtByjFc8IkQyE1k5V+qrkgE=; b=hoyoxMF+KABsV9stHhLsI9xnoeB5/8G+MGqPpp3OiVEAQFjgkv9uPAGIzpOTFtDjGiBj2I w/ReotPPwSSKLMJELG5u9Lf1hW4jWv3q+TpHNHBT4UiXQDuZXp0mmG515KzkC7HMCpZLS0 rvrBWww3oOFwJ4wjLu3PxrlR8Lpg5rUu0uRH2PSUpRi0paAnlY0bFJDn7rGwttLWSnDfGP ymiTvFuARIwbtjJFASCVsnSNhQrPYLdD8n8X2sL665wS1jjEJUYl9YzCDZoQ9cm0V6bwSH 0F/NZ0pKwr/eE0CvhHRZKAgHHSODJSkd7GltPAJ7YHc/F9kfTRL0oScfgjAOlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753793264; a=rsa-sha256; cv=none; b=wN284cDzK56IJCsa3pDjIFCDpWxDSUvSSRPjhajbIuWKGcy9uQaRYLt0kLtGc2obV+cw4W 8CLQHIENf8dX7ylJfE8ck74HqWgYW6zPgzp4cRiH8nMgyh98OJ8EVm4cD9IRfv4LceeTvB btutmoCSqhHzeo4aasE59uxDj0WjNY9Erg74+0bem8oC+HaY/2wbqk0neuBXPhbeWQG7sx HDx1Td/hEn7IZ5WeWaaGLqL7eMJSuAbK1Qs2N8Hr+EjOI8o6kYZOaGyImMtvj13x14bUKL 7rqNas7mzfs/njzabjlZRnh+yMBYU61PtlecJNq0O/Ak3Pje1GYbLHgEUO8CBw== 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 4brw9X13cLzXq1; Tue, 29 Jul 2025 12:47:44 +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 56TClh3c032685; Tue, 29 Jul 2025 12:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TClhiR032682; Tue, 29 Jul 2025 12:47:43 GMT (envelope-from git) Date: Tue, 29 Jul 2025 12:47:43 GMT Message-Id: <202507291247.56TClhiR032682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 98eb6f0eaa50 - main - ufs: restore conditional 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98eb6f0eaa50d8bd9a6794f0a9da2eddeae5bcd8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98eb6f0eaa50d8bd9a6794f0a9da2eddeae5bcd8 commit 98eb6f0eaa50d8bd9a6794f0a9da2eddeae5bcd8 Author: Konstantin Belousov AuthorDate: 2025-07-29 12:45:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-29 12:47:37 +0000 ufs: restore conditional Fixes: 610319c766e941de96e52f2d28fea9f8cfc51aeb Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/ufs/ufs/ufs_vnops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 2757fb066981..050b21c2be0b 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1642,7 +1642,8 @@ relock: softdep_change_linkcnt(tip); } error = ufs_dirrewrite(tdp, tip, fip->i_number, - IFTODT(fip->i_mode), doingdirectory); + IFTODT(fip->i_mode), (doingdirectory && newparent != 0) ? + newparent != 0: doingdirectory); if (error) { if (doingdirectory) { if (newparent == 0) {