Author: kib
Date: Thu Feb 23 09:41:32 2017
New Revision: 314134
URL: https://svnweb.freebsd.org/changeset/base/314134
Log:
MFC r313495:
Do not establish advisory locks when doing open(O_EXLOCK) or open(O_SHLOCK)
for files which do not have DTYPE_VNODE type.
MFC r313549:
Fix r313495.
Modified:
stable/11/sys/kern/vfs_vnops.c
stable/11/sys/sys/file.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/vfs_vnops.c
==============================================================================
--- stable/11/sys/kern/vfs_vnops.c Thu Feb 23 09:30:37 2017
(r314133)
+++ stable/11/sys/kern/vfs_vnops.c Thu Feb 23 09:41:32 2017
(r314134)
@@ -349,8 +349,12 @@ vn_open_vnode(struct vnode *vp, int fmod
if ((error = VOP_OPEN(vp, fmode, cred, td, fp)) != 0)
return (error);
- if (fmode & (O_EXLOCK | O_SHLOCK)) {
+ while ((fmode & (O_EXLOCK | O_SHLOCK)) != 0) {
KASSERT(fp != NULL, ("open with flock requires fp"));
+ if (fp->f_type != DTYPE_NONE && fp->f_type != DTYPE_VNODE) {
+ error = EOPNOTSUPP;
+ break;
+ }
lock_flags = VOP_ISLOCKED(vp);
VOP_UNLOCK(vp, 0);
lf.l_whence = SEEK_SET;
@@ -367,8 +371,12 @@ vn_open_vnode(struct vnode *vp, int fmod
if (error == 0)
fp->f_flag |= FHASLOCK;
vn_lock(vp, lock_flags | LK_RETRY);
- if (error == 0 && vp->v_iflag & VI_DOOMED)
+ if (error != 0)
+ break;
+ if ((vp->v_iflag & VI_DOOMED) != 0) {
error = ENOENT;
+ break;
+ }
/*
* Another thread might have used this vnode as an
@@ -376,20 +384,20 @@ vn_open_vnode(struct vnode *vp, int fmod
* Ensure the vnode is still able to be opened for
* writing after the lock has been obtained.
*/
- if (error == 0 && accmode & VWRITE)
+ if ((accmode & VWRITE) != 0)
error = vn_writechk(vp);
+ break;
+ }
- if (error != 0) {
- fp->f_flag |= FOPENFAILED;
- fp->f_vnode = vp;
- if (fp->f_ops == &badfileops) {
- fp->f_type = DTYPE_VNODE;
- fp->f_ops = &vnops;
- }
- vref(vp);
+ if (error != 0) {
+ fp->f_flag |= FOPENFAILED;
+ fp->f_vnode = vp;
+ if (fp->f_ops == &badfileops) {
+ fp->f_type = DTYPE_VNODE;
+ fp->f_ops = &vnops;
}
- }
- if (error == 0 && fmode & FWRITE) {
+ vref(vp);
+ } else if ((fmode & FWRITE) != 0) {
VOP_ADD_WRITECOUNT(vp, 1);
CTR3(KTR_VFS, "%s: vp %p v_writecount increased to %d",
__func__, vp, vp->v_writecount);
Modified: stable/11/sys/sys/file.h
==============================================================================
--- stable/11/sys/sys/file.h Thu Feb 23 09:30:37 2017 (r314133)
+++ stable/11/sys/sys/file.h Thu Feb 23 09:41:32 2017 (r314134)
@@ -55,6 +55,7 @@ struct socket;
#endif /* _KERNEL */
+#define DTYPE_NONE 0 /* not yet initialized */
#define DTYPE_VNODE 1 /* file */
#define DTYPE_SOCKET 2 /* communications endpoint */
#define DTYPE_PIPE 3 /* pipe */
_______________________________________________
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"
