From owner-svn-ports-all@freebsd.org Thu Feb 6 20:18:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15811239772; Thu, 6 Feb 2020 20:18:11 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48D8rL6s2zz4cwH; Thu, 6 Feb 2020 20:18:10 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E68E321205; Thu, 6 Feb 2020 20:18:10 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016KIAxr078189; Thu, 6 Feb 2020 20:18:10 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016KIAYr078187; Thu, 6 Feb 2020 20:18:10 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <202002062018.016KIAYr078187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Thu, 6 Feb 2020 20:18:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525444 - in head/emulators/open-vm-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/emulators/open-vm-tools: . files X-SVN-Commit-Revision: 525444 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 20:18:11 -0000 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 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; }