From nobody Wed Aug 6 00:28:30 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 4bxWNv01RGz63wLB; Wed, 06 Aug 2025 00:28: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxWNt4Byyz3Lfn; Wed, 06 Aug 2025 00:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754440110; 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=S5oes2rO6c+I7QRix+HNgM0OrxQ/sB6RRhYAmx64oCI=; b=j82YUydUuw3439zWjXPyPT5cu9BYnH9OkCG0W8NH6IzgTnAUNsC1Jucza6hLaVZ4nf9S3M 3PLGr4YAZiIo45KbNg0Clv0387yo801YiyT38/qghM4w0U2cejkvypBIiCkPk+Tvbv6yVX mEyEUJiepuO6hpZHMN6cnbeFUnEvH38xrw69y7eEXLmesZhsTY/1JzEna0/pXFkSJa+Dh6 +QLuQZwheiRgNRoO4MrOEOKYTWohQ/sw5ESMYzNIQ/UblIeN1CfCcgaRLFNob5bINI7QyW ZeTqQFWTvublPBLzJzYvmFGMhGyhVWctJr3T9YBINeS18Xv5YuvAWcXjl+zBOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754440110; 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=S5oes2rO6c+I7QRix+HNgM0OrxQ/sB6RRhYAmx64oCI=; b=tkWrKpiVgY1gYQimcuwdzgTBpv9OyrCjkZT48vaPBq22OSNItsKmbNg78A9bFqmPQWPHMu nahEnBUVxXj0GcQbG80r523h1tu+IVszIaCTsxnklklKxTEnvTMN+qVnV6/cX+e5vxgHGd qFbCeu0jTdfMTy2bgvhGqnuDTOe0AJ+JF3j1GSO7p8bSAoBJbo0QTxfK7rTMy3MEyIvm5Y atDMDg5YRY3ZKPO/aJ1zHfOCI68CXf/koWRHJgBD8+UywWm/sVzSPy0sDGgwTovmR3O5S1 q29Iqb4g4J5B7iPR0UHMXfc+SW+M5ygBh8s26bV+chrBseyumtWNFD0Ypz72VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754440110; a=rsa-sha256; cv=none; b=qgBBDXSh3/STlD+hsqMmlng3I3oLp5gvIu5WF3smucg7vGwT5QlInJNjQXCWT3YxY/w3A/ Gunq2kWBNcfQFbnPy2tcScpWezdQCvq07W4GZn8cgaejFEtdSHxJV9AnZSMC4H9ai+ymNL f6reEWHly+ERXBlpwWOXDMwm/NAAqVE+1kGow9dwdNfJ7qrfMxkWYqsjcUEUsnakF8N4TA aZj8tGb/j1wBHOea9Qr4zZQgIDa1AnFcgvO2F3FA8XeDuNFrkNia61iu9c7yECsB2cYzvp VM7jA87chKlYLJKfLAgGVFc79dz8kYXuijc//1snLXCk6gd/ITsFd1MOm1A8Sw== 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 4bxWNt1mdrzxqM; Wed, 06 Aug 2025 00:28:30 +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 5760SU8n040711; Wed, 6 Aug 2025 00:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5760SUw0040709; Wed, 6 Aug 2025 00:28:30 GMT (envelope-from git) Date: Wed, 6 Aug 2025 00:28:30 GMT Message-Id: <202508060028.5760SUw0040709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f8073b224a14 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f8073b224a14d1e2ae61408667818e401cced1b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f8073b224a14d1e2ae61408667818e401cced1b0 commit f8073b224a14d1e2ae61408667818e401cced1b0 Author: Konstantin Belousov AuthorDate: 2025-07-29 12:45:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-06 00:26:32 +0000 ufs: restore conditional (cherry picked from commit 98eb6f0eaa50d8bd9a6794f0a9da2eddeae5bcd8) --- 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 924e70a1a5f5..6940510e315e 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1654,7 +1654,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) {