summaryrefslogtreecommitdiffstats
path: root/block-stray-block-put-after-teardown.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-16 10:28:25 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-16 10:31:40 -0400
commitbc12142e94b6bc3c20e422e596cff4d0426c3be7 (patch)
tree39eaaae2dd0d0cfd3eb3521abd6428e40f05645a /block-stray-block-put-after-teardown.patch
parent8ffa0afd4c9c71c3ee7ed3b8310bada71259173a (diff)
downloadkernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.gz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.xz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.zip
Add a few patches that were in f16 but not in rawhide
Diffstat (limited to 'block-stray-block-put-after-teardown.patch')
-rw-r--r--block-stray-block-put-after-teardown.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/block-stray-block-put-after-teardown.patch b/block-stray-block-put-after-teardown.patch
new file mode 100644
index 000000000..f4bf9c40c
--- /dev/null
+++ b/block-stray-block-put-after-teardown.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.39.noarch/block/elevator.c~ 2011-08-09 10:07:41.532774872 -0400
++++ linux-2.6.39.noarch/block/elevator.c 2011-08-09 10:07:56.131724173 -0400
+@@ -815,7 +815,7 @@ void elv_completed_request(struct reques
+ */
+ if (blk_account_rq(rq)) {
+ q->in_flight[rq_is_sync(rq)]--;
+- if ((rq->cmd_flags & REQ_SORTED) &&
++ if ((rq->cmd_flags & REQ_SORTED) && e->ops &&
+ e->ops->elevator_completed_req_fn)
+ e->ops->elevator_completed_req_fn(q, rq);
+ }