packages: kernel/kernel-small_fixes.patch, kernel/kernel.spec - rel 8; blk ...
arekm
arekm at pld-linux.org
Thu May 19 10:24:06 CEST 2011
Author: arekm Date: Thu May 19 08:24:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 8; blk elevator oops fix
---- Files affected:
packages/kernel:
kernel-small_fixes.patch (1.24 -> 1.25) , kernel.spec (1.923 -> 1.924)
---- Diffs:
================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.24 packages/kernel/kernel-small_fixes.patch:1.25
--- packages/kernel/kernel-small_fixes.patch:1.24 Mon Apr 18 09:55:27 2011
+++ packages/kernel/kernel-small_fixes.patch Thu May 19 10:24:00 2011
@@ -119,3 +119,38 @@
+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 at 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 at vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.923 packages/kernel/kernel.spec:1.924
--- packages/kernel/kernel.spec:1.923 Wed May 18 19:03:23 2011
+++ packages/kernel/kernel.spec Thu May 19 10:24:00 2011
@@ -95,7 +95,7 @@
%define basever 2.6.38
%define postver .6
-%define rel 7
+%define rel 8
%define _enable_debug_packages 0
@@ -1553,6 +1553,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.924 2011/05/19 08:24:00 arekm
+- rel 8; blk elevator oops fix
+
Revision 1.923 2011/05/18 17:03:23 arekm
- rel 7; disable mutex debugging
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.923&r2=1.924&f=u
More information about the pld-cvs-commit
mailing list