From nobody Wed Aug 6 00:28:29 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 4bxWNs2gxRz63wJ0; Wed, 06 Aug 2025 00:28:29 +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 4bxWNs1Dl6z3M2c; Wed, 06 Aug 2025 00:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754440109; 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=EvYKLMjWcP+PaZzGgxvLaJsmjqDXNGbf27wz17h2cdo=; b=Jid7nAXkXctFATVr+zhVA0ZdAdCoGQeA76w8kwd+E6KI2Lh9ByCahvQzh37Fd9DxWRwwcG mMh2Y8k37P5eiSDXlVtJaT5g76DGWz6Uncq6ZrU9ztEmbxWqczAz7kFx3vDQhNAhT8hTYj FZ5RYwxQrtUHIPGn3YPZyPd9meV3VMBVHXJvT6djVbMsxs+fZvi2zVcX/J254260tngjnA 3sHC5YZ7dkr461uAN23IEIYYmPGDfKgmatogwtsq0BhSxEsGMSmsmOmmNsQYbwndhI65xa 9mTWo0AFJ88D10yCfLEVqsRLr4UYjXyo5pf+BCZFxOuQFYhCnadn8gdZvkIrrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754440109; 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=EvYKLMjWcP+PaZzGgxvLaJsmjqDXNGbf27wz17h2cdo=; b=C6e4paUIOEtdIW3Yha7jrtmfaklwXUSNWPdI6F0b5KhYUCUp34CGDMfSwVDcKy9lvKIwl9 9PXkFNgE5lBjwuimA3wfl9dDqNIPeMm3kfgdtuL7d6OZOWSnAYE2u5+zEMICVwrzHfTHOv IEZM1oaqNuQTSs/ZIwzwwiN+MbRm7v+rZ3lsJSNgU694RJ/g2R1OA0oAmJ5EzlXFg2NKfE WcDnd55N6BiXWUuA0RbzD0Uq9adLJSDyPETdY+j7wZ6fsbjSlZJs0qfAXyEW65qhLDV+rb z55iefF5XxC5TxZSv8a2rF0moMfw+WcEbLcsAVSZO9BD3z9W64MuHt/NpPl8lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754440109; a=rsa-sha256; cv=none; b=p6ZXF7sziMQqQRtp8hQcvFFEYtpF+zpqNDzncrCPeMm+kkqTqmO6bHOnQokSqIrZpd6N35 F7+1VRPr8ji5BWEFVi6F4emei0Co67+TEh3jkoryyRQDP2I6bXuR4x1FtHcPVf95D6m6T2 mSwZb8U7cKxxeMiquT8WCGr2X/sRxH3va8P3M8b+ze3xx8msr/ZEq6YKHTlyqjJU6mWGih X7D/UvmoweFFoTkGmAowfskEGD1wWa0AXoQcG4rcJy/tvZJlziZO97JpeUZ3rixcTkGEB9 RVtBMMnuEgYcM80wV6yPEiT5vAJSuhbSaJ6LDshU1GZpBVrxoPDbmRSTQuoM0g== 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 4bxWNs0qnVzxTQ; Wed, 06 Aug 2025 00:28:29 +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 5760STsu040678; Wed, 6 Aug 2025 00:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5760STKE040675; Wed, 6 Aug 2025 00:28:29 GMT (envelope-from git) Date: Wed, 6 Aug 2025 00:28:29 GMT Message-Id: <202508060028.5760STKE040675@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: c330e9622403 - stable/14 - ufs_vnops.c: newparent is not bool 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: c330e962240311aefde305b4644abf9fc627f511 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c330e962240311aefde305b4644abf9fc627f511 commit c330e962240311aefde305b4644abf9fc627f511 Author: Konstantin Belousov AuthorDate: 2025-07-27 13:50:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-06 00:26:32 +0000 ufs_vnops.c: newparent is not bool (cherry picked from commit 610319c766e941de96e52f2d28fea9f8cfc51aeb) --- sys/ufs/ufs/ufs_vnops.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 7375e931d26b..924e70a1a5f5 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1482,7 +1482,7 @@ relock: * the user must have write permission in the source so * as to be able to change "..". */ - if (doingdirectory && newparent) { + if (doingdirectory && newparent != 0) { error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, curthread); if (error) goto unlockout; @@ -1549,7 +1549,7 @@ relock: if (tip == NULL) { if (ITODEV(tdp) != ITODEV(fip)) panic("ufs_rename: EXDEV"); - if (doingdirectory && newparent) { + if (doingdirectory && newparent != 0) { /* * Account for ".." in new directory. * When source and destination have the same @@ -1644,7 +1644,7 @@ relock: goto bad; } if (doingdirectory) { - if (!newparent) { + if (newparent == 0) { tdp->i_effnlink--; if (DOINGSOFTDEP(tdvp)) softdep_change_linkcnt(tdp); @@ -1654,11 +1654,10 @@ relock: softdep_change_linkcnt(tip); } error = ufs_dirrewrite(tdp, tip, fip->i_number, - IFTODT(fip->i_mode), - (doingdirectory && newparent) ? newparent : doingdirectory); + IFTODT(fip->i_mode), doingdirectory); if (error) { if (doingdirectory) { - if (!newparent) { + if (newparent == 0) { tdp->i_effnlink++; if (DOINGSOFTDEP(tdvp)) softdep_change_linkcnt(tdp); @@ -1681,7 +1680,7 @@ relock: * disk, so when running with that code we avoid doing * them now. */ - if (!newparent) { + if (newparent == 0) { tdp->i_nlink--; DIP_SET_NLINK(tdp, tdp->i_nlink); UFS_INODE_SET_FLAG(tdp, IN_CHANGE); @@ -1710,7 +1709,7 @@ relock: * parent directory must be decremented * and ".." set to point to the new parent. */ - if (doingdirectory && newparent) { + if (doingdirectory && newparent != 0) { /* * Set the directory depth based on its new parent. */