svn commit: r525444 - in head/emulators/open-vm-tools: . files
Josh Paetzel
jpaetzel at FreeBSD.org
Thu Feb 6 20:18:11 UTC 2020
Author: jpaetzel
Date: Thu Feb 6 20:18:10 2020
New Revision: 525444
URL: https://svnweb.freebsd.org/changeset/ports/525444
Log:
Unbreak build on HEAD
PR: 243864
Submitted by: Ruslan Garipov <brigadir15 at gmail.com>
Sponsored by: Panzura
Modified:
head/emulators/open-vm-tools/Makefile
head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c
Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile Thu Feb 6 19:28:54 2020 (r525443)
+++ head/emulators/open-vm-tools/Makefile Thu Feb 6 20:18:10 2020 (r525444)
@@ -4,7 +4,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= emulators
Modified: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c Thu Feb 6 19:28:54 2020 (r525443)
+++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c Thu Feb 6 20:18:10 2020 (r525444)
@@ -1,6 +1,33 @@
--- modules/freebsd/vmblock/vnops.c.orig 2019-10-21 21:58:04 UTC
+++ 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;
@@ -16,7 +43,7 @@
/*
* If caller already holds interlock, drop it. (Per VOP_UNLOCK() API.)
* 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);
ap->a_flags = flags &= ~LK_INTERLOCK;
}
More information about the svn-ports-all
mailing list