From nobody Mon Jul 28 20:57:21 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 4brW4y0Ygjz63T1P; Mon, 28 Jul 2025 20:57:22 +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 4brW4x5rcpz44pL; Mon, 28 Jul 2025 20:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753736241; 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=kit2dlZe3Er3jkV71A4C1hUI1WLsCBnizdLld/eZJfo=; b=L8c7lmdGk95nOxdhNJbVRxSNM6JhNKWm5S4HjIoSaXJSV0E3ws9gmeN57OrCc7o9phU57K i6f3NpQJN5kz/2MUVbgwWSQGdc8Mh14ZUVxbPpDOQA4nakb44V41/Mda6Y3VUudk0pu+kw mpK6IIe2AU8KC8Ptdb4tXKrOThGfnqELxn8INfzz7Es2Kx6cgn2zoEjWxidDR7Op96xaqE T30Fw7Unon50szytq/u4axusMUxUwzm0h+kmps7/KSNRhiQwjb2mCLui4IXjOxh0uVlmBG Mp7v17+0y99mgdvNvGAKwbYQhXUCPbCaVen1l53Jn8GX7XdHT+5otJN4G0t/3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753736241; 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=kit2dlZe3Er3jkV71A4C1hUI1WLsCBnizdLld/eZJfo=; b=lI4PsD2sFAQscr4C4c/OC5MPZnC+S1qb2YkV90hcsgdaJEBN1Mko1OJ2f7Rffeb7Q6Jn4U cqoHorzPlCTHiOA0AEuZKwzL6VU0YCPruNWD5LWG/hvRP1HgAlVMp7dFoE1kPCUutQNkjM sCoDSciE080FA0p+jKvuLwDHfkj6qeoPo2BvyWx0M/SeB37/i93u97l1bQQQbdPJFwlEDo hFUxTS4ko5+fXXcaryUviJkn3YKcreieBWxbn9ysFz5sIszjpR8FBav9oSe5j8c2LYU2zx BSz6gU3l13BS+h4FS/urlR2BtBAylevmLR6wboM9l2lQUEEjvBQa9yYqTmj5Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753736241; a=rsa-sha256; cv=none; b=TPnHoUiJTP9CdEn6E8edrBsbKDdhhpFydAH3kgKntT5rJmH+RILVObu14+NEIFyV7H+zLs jZLtvzC2vK6NW3wMMphFKmS3oTxFuyFeZ2zt656Ofp+TYwXKe67LdjN4FX/k7kgm5Pe4sY mlwxs+BwZaxo6bP2ECpxufcS+GAZIgOcT8bL5bA+6splOc6QBfiJdI251drTzG2dCic1AU BCF0rTzZRnjZ5Dais6t5gcIhTWEM+diGuDj5DPRrY85Tt5ZFH6+xf2yYU2oMgTyxj4mOPc lOsPhZGaiu0mcVnmaxf1qwSUIVnKV3pZIplYada7ZTCek934jtaP4I8xzIwavg== 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 4brW4x54W2z11p0; Mon, 28 Jul 2025 20:57:21 +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 56SKvLLs019406; Mon, 28 Jul 2025 20:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SKvL6x019403; Mon, 28 Jul 2025 20:57:21 GMT (envelope-from git) Date: Mon, 28 Jul 2025 20:57:21 GMT Message-Id: <202507282057.56SKvL6x019403@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: 610319c766e9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 610319c766e941de96e52f2d28fea9f8cfc51aeb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=610319c766e941de96e52f2d28fea9f8cfc51aeb commit 610319c766e941de96e52f2d28fea9f8cfc51aeb Author: Konstantin Belousov AuthorDate: 2025-07-27 13:50:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-28 20:57:14 +0000 ufs_vnops.c: newparent is not bool Use proper comparision operators when we need to see if newparent was set to not-zero value. Reviewed by: mckusick, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51573 --- 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 406b8f943077..2757fb066981 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1476,7 +1476,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; @@ -1539,7 +1539,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 @@ -1632,7 +1632,7 @@ relock: goto bad; } if (doingdirectory) { - if (!newparent) { + if (newparent == 0) { tdp->i_effnlink--; if (DOINGSOFTDEP(tdvp)) softdep_change_linkcnt(tdp); @@ -1642,11 +1642,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); @@ -1669,7 +1668,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); @@ -1698,7 +1697,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. */