sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbreak build on HEAD

Browse source 
PR:	243864
Submitted by:	Ruslan Garipov <brigadir15@gmail.com>
Sponsored by:	Panzura
This commit is contained in:
Josh Paetzel 2020-02-06 20:18:10 +00:00
parent ab9c0d30d6
commit e43dda5328
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=525444
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/open-vm-tools/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= open-vm-tools PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER} PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable- DISTVERSIONPREFIX= stable-
PORTREVISION= 2 PORTREVISION= 3
PORTEPOCH= 2 PORTEPOCH= 2
CATEGORIES= emulators CATEGORIES= emulators

31
emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c
View file

@ -1,6 +1,33 @@
--- modules/freebsd/vmblock/vnops.c.orig 2019-10-21 21:58:04 UTC --- modules/freebsd/vmblock/vnops.c.orig 2019-10-21 21:58:04 UTC
+++ modules/freebsd/vmblock/vnops.c +++ modules/freebsd/vmblock/vnops.c
@@ -1262,12 +1262,15 @@ struct vop_unlock_args { @@ -532,17 +532,12 @@ struct vop_generic_args {
* Map the possible out-going vpp (Assumes that the lower layer always
* returns a VREF'ed vpp unless it gets an error.)
*/
- if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET &&
- !(descp->vdesc_flags & VDESC_NOMAP_VPP) &&
- !error) {
+ if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && !error) {
/*
* XXX - even though some ops have vpp returned vp's, several ops
* actually vrele this before returning. We must avoid these ops.
* (This should go away when these ops are regularized.)
*/
- if (descp->vdesc_flags & VDESC_VPP_WILLRELE) {
- goto out;
- }
vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset,ap);
if (*vppp) {
/* FIXME: set proper name for the vnode */
@@ -550,7 +545,6 @@ struct vop_generic_args {
}
}
-out:
return error;
}
@@ -1262,12 +1256,15 @@ struct vop_unlock_args {
*/ */
{ {
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;
@ -16,7 +43,7 @@
/* /*
* If caller already holds interlock, drop it. (Per VOP_UNLOCK() API.) * If caller already holds interlock, drop it. (Per VOP_UNLOCK() API.)
* Also strip LK_INTERLOCK from flags passed to lower layer. * Also strip LK_INTERLOCK from flags passed to lower layer.
@@ -1276,6 +1279,7 @@ struct vop_unlock_args { @@ -1276,6 +1273,7 @@ struct vop_unlock_args {
VI_UNLOCK(vp); VI_UNLOCK(vp);
ap->a_flags = flags &= ~LK_INTERLOCK; ap->a_flags = flags &= ~LK_INTERLOCK;
} }