- rel 8; blk elevator oops fix

Changed files:
    kernel-small_fixes.patch -> 1.25
    kernel.spec -> 1.924

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 77045f48be99c6c0b7102c0331db03b5da94a000..4b2df1925c9e6be15bb285dcac04461bec16629c 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -119,3 +119,38 @@ index 2494842..edf37aa 100644
 
 
 
+blk_cleanup_queue() calls elevator_exit() and after this, we can't
+touch the elevator without oopsing.  __elv_next_request() must check
+for this state because in the refcounted queue model, we can still
+call it after blk_cleanup_queue() has been called.
+
+This was reported as causing an oops attributable to scsi.
+
+Signed-off-by: James Bottomley <James.Bottomley@suse.de>
+---
+ block/blk.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/block/blk.h b/block/blk.h
+index 6126346..4df474d 100644
+--- a/block/blk.h
++++ b/block/blk.h
+@@ -62,7 +62,8 @@ static inline struct request *__elv_next_request(struct request_queue *q)
+                       return rq;
+               }
+ 
+-              if (!q->elevator->ops->elevator_dispatch_fn(q, 0))
++              if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) ||
++                  !q->elevator->ops->elevator_dispatch_fn(q, 0))
+                       return NULL;
+       }
+ }
+-- 
+1.7.4.1
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file

diff --git a/kernel.spec b/kernel.spec
index 4caa4fa362b47db9045ab4df79829aba2c28ca14..40eba27fd188c07a7f911fb784eb40c7e1cd8be5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -94,7 +94,7 @@
 
 %define                basever         2.6.38
 %define                postver         .6
-%define                rel             7
+%define                rel             8
 
 %define                _enable_debug_packages                  0