From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 6 Apr 2010 18:57:43 +0000 (+0000)
Subject: disable barrier related patches for now
X-Git-Tag: linux-2.6-27-8~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=694f0025c24cb457deb48152a1ebfa0be86373e2;p=linux-2.6.git

disable barrier related patches for now
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 50e88d61b..96179abbb 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -184,8 +184,8 @@ Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
 Patch800: linux-2.6-800-rename-ext4dev-to-ext4.patch
 Patch810: linux-2.6-810-ext4-cap-check-delay.patch
 
-Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
-Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+#Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
+#Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -386,8 +386,10 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 800
 %ApplyPatch 810
 
+%if 0
 %ApplyPatch 900
 %ApplyPatch 910
+%endif
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
diff --git a/linux-2.6-910-support_barriers_on_single_device_dm_devices.patch b/linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
index 329404c28..e6490ed71 100644
--- a/linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+++ b/linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
@@ -84,7 +84,7 @@ index 191f56d..8b11f14 100644
 +	if (unlikely(bio_barrier(bio) && !dm_table_barrier_ok(ci.map))) {
 +		dm_table_put(ci.map);
 +		bio_endio(bio, -EOPNOTSUPP);
-+		return;
++		return 0;
 +	}
 +
  	ci.md = md;