Author: kib
Date: Thu Feb 23 09:30:37 2017
New Revision: 314133
URL: https://svnweb.freebsd.org/changeset/base/314133
Log:
MFC r313496:
Increase a chance of devfs_close() calling d_close cdevsw method.
Modified:
stable/11/sys/kern/vfs_vnops.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/vfs_vnops.c
==============================================================================
--- stable/11/sys/kern/vfs_vnops.c Thu Feb 23 08:17:42 2017
(r314132)
+++ stable/11/sys/kern/vfs_vnops.c Thu Feb 23 09:30:37 2017
(r314133)
@@ -422,12 +422,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;
@@ -449,11 +446,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.
*/
@@ -1569,16 +1577,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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
