upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert rest of a5970a529c: use vrefact() when working on fp->f_vnode

Browse source 
Now, since O_PATH-opened file descriptors use use references instead
of the hold references, vrefact() chahges from that revision can be
reverted.

Reviewed by:	markj
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D34906
This commit is contained in:
Konstantin Belousov 2022-04-14 02:39:57 +03:00
parent eeba222172
commit 362ff9867e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/kern/kern_descrip.c
View file

@ -3087,7 +3087,7 @@ fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp)
error = ENOTDIR;
goto out_free;
}
vref(vp);
vrefact(vp);
/*
* XXX does not check for VDIR, handled by namei_setup
*/
@ -3537,7 +3537,7 @@ _fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp,
error = EINVAL;
} else {
*vpp = fp->f_vnode;
vref(*vpp);
vrefact(*vpp);
}
fdrop(fp, td);
@ -3573,7 +3573,7 @@ fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp,
*havecaps = caps;
*vpp = fp->f_vnode;
vref(*vpp);
vrefact(*vpp);
fdrop(fp, td);
return (0);

2
sys/kern/vfs_syscalls.c
View file

@ -907,7 +907,7 @@ sys_fchdir(struct thread *td, struct fchdir_args *uap)
if (error != 0)
return (error);
vp = fp->f_vnode;
vref(vp);
vrefact(vp);
fdrop(fp, td);
vn_lock(vp, LK_SHARED | LK_RETRY);
AUDIT_ARG_VNODE1(vp);