b=23966 Revert "b=21137 sles11 with 1.8 is slower than 1.6 sles10 for O_DIRECT single...

This reverts commit 1242fac546a8c252dee5715bb218133795211028.
This introduces issues with SATA drivers. See bug 23966.

diff --git a/lustre/kernel_patches/patches/bio_add_page.patch b/lustre/kernel_patches/patches/bio_add_page.patch
deleted file mode 100644 (file)
index 4a9a311..0000000
--- a/lustre/kernel_patches/patches/bio_add_page.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- linux-2.6.32.13-0.5.orig/fs/bio.c  2010-08-13 04:22:33.000000000 -0400
-+++ linux-2.6.32.13-0.5/fs/bio.c       2010-09-08 15:35:44.000000000 -0400
-@@ -575,8 +575,7 @@ static int __bio_add_page(struct request
-        * make this too complex.
-        */
- 
--      while (bio->bi_phys_segments >= queue_max_phys_segments(q)
--             || bio->bi_phys_segments >= queue_max_hw_segments(q)) {
-+      while (bio->bi_phys_segments >= queue_max_phys_segments(q)) {
- 
-               if (retried_segments)
-                       return 0;

diff --git a/lustre/kernel_patches/series/2.6-sles11.series b/lustre/kernel_patches/series/2.6-sles11.series
index abb2bbc..7160e40 100644 (file)
--- a/lustre/kernel_patches/series/2.6-sles11.series
+++ b/lustre/kernel_patches/series/2.6-sles11.series
@@ -9,4 +9,3 @@ sd_iostats-2.6.27-vanilla.patch
 md-mmp-unplug-dev-sles11.patch
 quota-support-64-bit-quota-format.patch
 jbd2-jcberr-2.6-sles11.patch
-bio_add_page.patch