upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-06 07:12:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ufs_vnops.c: newparent is not bool

Browse source 
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
This commit is contained in:
Konstantin Belousov 2025-07-27 16:50:57 +03:00
parent c069ca085b
commit 610319c766
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/ufs/ufs/ufs_vnops.c
View file

@ -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.
*/