summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kuznetsov <vadimk@gentoo.org>2012-11-11 15:18:36 -0500
committerVadim Kuznetsov <vadimk@gentoo.org>2012-11-11 15:18:36 -0500
commit18ba5b4e14eae247667aef20dea061204f0183a8 (patch)
treef64cc8c45b5bac90266e0ce857cad8760c665ba8 /app-emulation/open-vm-tools-kmod/files
parentunmasking vmware desktop 9 (diff)
downloadvmware-18ba5b4e14eae247667aef20dea061204f0183a8.tar.gz
vmware-18ba5b4e14eae247667aef20dea061204f0183a8.tar.bz2
vmware-18ba5b4e14eae247667aef20dea061204f0183a8.zip
open-vm-tools: version bump
Diffstat (limited to 'app-emulation/open-vm-tools-kmod/files')
-rw-r--r--app-emulation/open-vm-tools-kmod/files/frozen.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/app-emulation/open-vm-tools-kmod/files/frozen.patch b/app-emulation/open-vm-tools-kmod/files/frozen.patch
new file mode 100644
index 0000000..8b3fd7f
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/files/frozen.patch
@@ -0,0 +1,28 @@
+diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
+--- a/modules/linux/vmsync/sync.c 2012-08-01 19:02:59.000000000 -0700
++++ b/modules/linux/vmsync/sync.c 2012-10-14 07:38:18.000000000 -0700
+@@ -162,7 +162,11 @@ VmSyncThawDevices(void *_state) // IN
+ cancel_delayed_work(&state->thawTask);
+ list_for_each_safe(cur, tmp, &state->devices) {
+ dev = list_entry(cur, VmSyncBlockDevice, list);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+ if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
++#endif
+ thaw_bdev(dev->bdev, dev->sb);
+ atomic_dec(&gFreezeCount);
+ }
+@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state,
+ * the superblock is already frozen.
+ */
+ if (inode->i_sb->s_bdev == NULL ||
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++ inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+ inode->i_sb->s_frozen != SB_UNFROZEN) {
++#endif
+ result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
+ compat_path_release(&nd);
+ goto exit;
+