diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2021-02-15 22:08:20 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2021-04-10 05:57:55 +0000 |
| commit | 4606d441703d695ab74d6e66fadc18703615e4dc (patch) | |
| tree | 22fd017007eee12a35a3c1ed2cdfad2caf88260e | |
| parent | fb16013129a10a10be46197a82b814e479ed0905 (diff) | |
| download | src-4606d441703d695ab74d6e66fadc18703615e4dc.tar.gz src-4606d441703d695ab74d6e66fadc18703615e4dc.zip | |
vfs: employ vfs_ref_from_vp in statfs and fstatfs
Avoids locking and unlocking the vnode.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D28695
(cherry picked from commit 81174cd8e24aa2bb27f6a8b41032abf59add479f)
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 40dd8c069bfb..3db34c3689de 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -331,15 +331,13 @@ kern_statfs(struct thread *td, const char *path, enum uio_seg pathseg, struct nameidata nd; int error; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1, - pathseg, path, td); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, pathseg, path, td); error = namei(&nd); if (error != 0) return (error); - mp = nd.ni_vp->v_mount; - vfs_ref(mp); + mp = vfs_ref_from_vp(nd.ni_vp); NDFREE_NOTHING(&nd); - vput(nd.ni_vp); + vrele(nd.ni_vp); return (kern_do_statfs(td, mp, buf)); } @@ -379,14 +377,14 @@ kern_fstatfs(struct thread *td, int fd, struct statfs *buf) if (error != 0) return (error); vp = fp->f_vnode; - vn_lock(vp, LK_SHARED | LK_RETRY); #ifdef AUDIT - AUDIT_ARG_VNODE1(vp); + if (AUDITING_TD(td)) { + vn_lock(vp, LK_SHARED | LK_RETRY); + AUDIT_ARG_VNODE1(vp); + VOP_UNLOCK(vp); + } #endif - mp = vp->v_mount; - if (mp != NULL) - vfs_ref(mp); - VOP_UNLOCK(vp); + mp = vfs_ref_from_vp(vp); fdrop(fp, td); return (kern_do_statfs(td, mp, buf)); } |