diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2010-01-02 16:29:44 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2010-01-02 16:29:44 +0000 |
| commit | 5fc5a0bb73cb52b68233c83c28e9beea8492be60 (patch) | |
| tree | 1e7feddcd34c88bd5b859a4b87058c0c382b0dad /emulators/open-vm-tools/files/patch-vmblock-subr.c | |
| parent | Bump copyright year to 2010 (diff) | |
Upgrade open-vm-tools to build 210370 (PR 142112)
Fix complile on FreeBSD 9
Add missing pkg-plist files
PR: ports/142112 (partly)
Submitted by: Steve Wills <steve@mouf.net>
Notes
Notes:
svn path=/head/; revision=247004
Diffstat (limited to 'emulators/open-vm-tools/files/patch-vmblock-subr.c')
| -rw-r--r-- | emulators/open-vm-tools/files/patch-vmblock-subr.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/emulators/open-vm-tools/files/patch-vmblock-subr.c b/emulators/open-vm-tools/files/patch-vmblock-subr.c deleted file mode 100644 index 0474a83699bf..000000000000 --- a/emulators/open-vm-tools/files/patch-vmblock-subr.c +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/freebsd/vmblock/subr.c.orig 2009-02-28 23:04:14.000000000 +0100 -+++ modules/freebsd/vmblock/subr.c 2009-02-28 23:05:38.000000000 +0100 -@@ -334,7 +334,12 @@ - vp->v_vnlock = &vp->v_lock; - FREE(xp, M_VMBLOCKFSNODE); - vp->v_op = &dead_vnodeops; -+ -+#if __FreeBSD_version >= 800011 -+ (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); -+#else - (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); -+#endif - vgone(vp); - vput(vp); - } -@@ -405,6 +410,13 @@ - return error; - } - -+#if __FreeBSD_version >= 700034 -+ if ((error = insmntque(vp, mp)) != 0) { -+ free(xp, M_VMBLOCKFSNODE); -+ return error; -+ } -+#endif -+ - xp->backVnode = vp; - xp->lowerVnode = lowervp; - vp->v_type = lowervp->v_type; |