diff options
author | kib <kib@FreeBSD.org> | 2017-02-24 11:34:00 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2017-02-24 11:34:00 +0000 |
commit | 81e6bddfc9a08fc84f3231b648ec2ae209bca843 (patch) | |
tree | 4fdc7bd8048f8d92258496a3d5c068539f7e640d /sys/kern | |
parent | ade5533c9e8c6be99eb55fca8b577967e97bc7ef (diff) | |
download | FreeBSD-src-81e6bddfc9a08fc84f3231b648ec2ae209bca843.zip FreeBSD-src-81e6bddfc9a08fc84f3231b648ec2ae209bca843.tar.gz |
MFC r313496:
Increase a chance of devfs_close() calling d_close cdevsw method.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/vfs_vnops.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f17ae89..a270806 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -412,12 +412,9 @@ vn_writechk(vp) /* * Vnode close call */ -int -vn_close(vp, flags, file_cred, td) - register struct vnode *vp; - int flags; - struct ucred *file_cred; - struct thread *td; +static int +vn_close1(struct vnode *vp, int flags, struct ucred *file_cred, + struct thread *td, bool keep_ref) { struct mount *mp; int error, lock_flags; @@ -438,11 +435,22 @@ vn_close(vp, flags, file_cred, td) __func__, vp, vp->v_writecount); } error = VOP_CLOSE(vp, flags, file_cred, td); - vput(vp); + if (keep_ref) + VOP_UNLOCK(vp, 0); + else + vput(vp); vn_finished_write(mp); return (error); } +int +vn_close(struct vnode *vp, int flags, struct ucred *file_cred, + struct thread *td) +{ + + return (vn_close1(vp, flags, file_cred, td, false)); +} + /* * Heuristic to detect sequential operation. */ @@ -1624,16 +1632,15 @@ vn_closefile(fp, td) struct vnode *vp; struct flock lf; int error; + bool ref; vp = fp->f_vnode; fp->f_ops = &badfileops; + ref= (fp->f_flag & FHASLOCK) != 0 && fp->f_type == DTYPE_VNODE; - if (fp->f_type == DTYPE_VNODE && fp->f_flag & FHASLOCK) - vref(vp); - - error = vn_close(vp, fp->f_flag, fp->f_cred, td); + error = vn_close1(vp, fp->f_flag, fp->f_cred, td, ref); - if (fp->f_type == DTYPE_VNODE && fp->f_flag & FHASLOCK) { + if (__predict_false(ref)) { lf.l_whence = SEEK_SET; lf.l_start = 0; lf.l_len = 0; |