rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

James' suggested fix for 728872

Browse Source
This commit is contained in:
Dave Jones 2011-08-09 10:11:03 -04:00
parent a75a12cf59
commit d2714557b2
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block-stray-block-put-after-teardown.patch Normal file
View File

@ -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);
}

9
kernel.spec
View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
%global baserelease 1
%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -623,6 +623,8 @@ Patch1825: drm-intel-make-lvds-work.patch
Patch1900: linux-2.6-intel-iommu-igfx.patch
Patch2000: block-stray-block-put-after-teardown.patch
# Quiet boot fixes
# silence the ACPI blacklist code
Patch2802: linux-2.6-silence-acpi-blacklist.patch
@ -1181,6 +1183,8 @@ ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-intel-make-lvds-work.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch
ApplyPatch block-stray-block-put-after-teardown.patch
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
@ -1821,6 +1825,9 @@ fi
# and build.
%changelog
* Tue Aug 09 2011 Dave Jones <davej@redhat.com> 2.6.40.1-2
- Fix stray block put after queue teardown (rhbz 728872)
* Sun Aug 07 2011 Dave Jones <davej@redhat.com>
- Utrace fixes. (rhbz 728379)