Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jan 2020 16:32:47 +0000 (UTC)
From:      Josh Paetzel <jpaetzel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522696 - head/emulators/open-vm-tools/files
Message-ID:  <202001111632.00BGWl1g059068@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jpaetzel
Date: Sat Jan 11 16:32:46 2020
New Revision: 522696
URL: https://svnweb.freebsd.org/changeset/ports/522696

Log:
  Fix build on HEAD
  
  PR:	243240
  Submitted by:	Ruslan Garipov <brigadir15@gmail.com>

Added:
  head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.h   (contents, props changed)
  head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c   (contents, props changed)

Added: head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.h	Sat Jan 11 16:32:46 2020	(r522696)
@@ -0,0 +1,14 @@
+--- modules/freebsd/shared/compat_vop.h.orig	2019-10-21 21:58:04 UTC
++++ modules/freebsd/shared/compat_vop.h
+@@ -47,7 +47,11 @@
+ #if __FreeBSD_version >= 800011
+ #define COMPAT_THREAD_VAR(varname, varval)
+ #define COMPAT_VOP_LOCK(vop, flags, threadvar) VOP_LOCK((vop), (flags))
++#if __FreeBSD_version >= 1300074
++#define COMPAT_VOP_UNLOCK(vop, flags, threadvar) VOP_UNLOCK((vop))
++#else
+ #define COMPAT_VOP_UNLOCK(vop, flags, threadvar) VOP_UNLOCK((vop), (flags))
++#endif
+ #define compat_lockstatus(lock, threadvar) lockstatus((lock))
+ #define compat_lockmgr(lock, flags, randompointerparam, threadval) lockmgr((lock), (flags), (randompointerparam))
+ #define compat_vn_lock(vp, flags, threadval) vn_lock((vp), (flags))

Added: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c	Sat Jan 11 16:32:46 2020	(r522696)
@@ -0,0 +1,26 @@
+--- 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 {
+ */
+ {
+    struct vnode *vp = ap->a_vp;
++#if __FreeBSD_version < 1300074
+    int flags = ap->a_flags;
++#endif
+    COMPAT_THREAD_VAR(td, ap->a_td);
+    struct VMBlockNode *nn;
+    struct vnode *lvp;
+    int error;
+ 
++#if __FreeBSD_version < 1300074
+    /*
+     * 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 {
+       VI_UNLOCK(vp);
+       ap->a_flags = flags &= ~LK_INTERLOCK;
+    }
++#endif
+    nn = VPTOVMB(vp);
+    if (nn != NULL && (lvp = VMBVPTOLOWERVP(vp)) != NULL) {
+       error = COMPAT_VOP_UNLOCK(lvp, flags, td);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001111632.00BGWl1g059068>