From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 9 06:10:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C5C2B4A6 for ; Sun, 9 Dec 2012 06:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 991998FC12 for ; Sun, 9 Dec 2012 06:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qB96A0MF061914 for ; Sun, 9 Dec 2012 06:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB96A0pL061913; Sun, 9 Dec 2012 06:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 9 Dec 2012 06:10:00 GMT Resent-Message-Id: <201212090610.qB96A0pL061913@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 857453A7 for ; Sun, 9 Dec 2012 06:07:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 4F1028FC08 for ; Sun, 9 Dec 2012 06:07:23 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB967NYb029635 for ; Sun, 9 Dec 2012 06:07:23 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qB967Nkj029634; Sun, 9 Dec 2012 06:07:23 GMT (envelope-from nobody) Message-Id: <201212090607.qB967Nkj029634@red.freebsd.org> Date: Sun, 9 Dec 2012 06:07:23 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/174290: [patch] emulators/open-vm-tools: fix compilation after non-MPSAFE deorbit X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2012 06:10:00 -0000 >Number: 174290 >Category: ports >Synopsis: [patch] emulators/open-vm-tools: fix compilation after non-MPSAFE deorbit >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Dec 09 06:10:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 10-CURRENT >Organization: EMC Isilon >Environment: n/a >Description: emulators/open-vm-tools* doesn't compile after r242833 because the MNTK_MPSAFE #define was removed. The attached patch adds a test for __FreeBSD_version < 1000021 so the code that applies MNTK_MPSAFE is only used for only versions of FreeBSD. >How-To-Repeat: Install 1000021+ or later. cd emulators/open-vm-tools; make all >Fix: Patch attached with submission follows: >From 4bef90c5e5608599a6eb77b5af078496ef81bbe7 Mon Sep 17 00:00:00 2001 From: Garrett Cooper Date: Wed, 5 Dec 2012 08:06:22 -0800 Subject: [PATCH] Chase r242833 on CURRENT Signed-off-by: Garrett Cooper --- .../open-vm-tools/files/patch-deorbit-MNTK_MPSAFE | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 emulators/open-vm-tools/files/patch-deorbit-MNTK_MPSAFE diff --git a/emulators/open-vm-tools/files/patch-deorbit-MNTK_MPSAFE b/emulators/open-vm-tools/files/patch-deorbit-MNTK_MPSAFE new file mode 100644 index 0000000..5320bd8 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-deorbit-MNTK_MPSAFE @@ -0,0 +1,23 @@ +--- modules/freebsd/vmblock/vfsops.c 2012-12-05 07:58:12.000000000 -0800 ++++ modules/freebsd/vmblock/vfsops.c 2012-12-05 07:58:56.000000000 -0800 +@@ -236,7 +236,7 @@ + */ + MNT_ILOCK(mp); + mp->mnt_flag |= lowerrootvp->v_mount->mnt_flag & MNT_LOCAL; +-#if __FreeBSD_version >= 600000 ++#if __FreeBSD_version >= 600000 && __FreeBSD_version < 1000021 + mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE; + #endif + MNT_IUNLOCK(mp); +--- modules/freebsd/vmhgfs/vfsops.c 2012-12-05 07:57:56.000000000 -0800 ++++ modules/freebsd/vmhgfs/vfsops.c 2012-12-05 08:00:43.000000000 -0800 +@@ -201,7 +201,9 @@ + * structures, not oplocks/leases with the VM's host.) + */ + MNT_ILOCK(mp); ++#if __FreeBSD_version < 1000021 + mp->mnt_kern_flag |= MNTK_MPSAFE; ++#endif + MNT_IUNLOCK(mp); + + /* Get a new unique filesystem ID */ -- 1.8.0 >Release-Note: >Audit-Trail: >Unformatted: