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

Minor cleanup: use upstream patch to export block_{get,put}_queue

This commit is contained in:
Chuck Ebbert 2011-06-24 00:37:15 -04:00
parent 797a5eb619
commit ce8c067136
3 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
block-export-blk_-get-put-_queue.patch Normal file
View File

@ -0,0 +1,39 @@
From d86e0e83b32bc84600adb0b6ea1fce389b266682 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 27 May 2011 07:44:43 +0200
Subject: block: export blk_{get,put}_queue()
From: Jens Axboe <jaxboe@fusionio.com>
commit d86e0e83b32bc84600adb0b6ea1fce389b266682 upstream.
[ backport to 2.6.38 ]
We need them in SCSI to fix a bug, but currently they are not
exported to modules. Export them.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
---
block/blk-core.c | 2 ++
1 file changed, 2 insertions(+)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -345,6 +345,7 @@ void blk_put_queue(struct request_queue
{
kobject_put(&q->kobj);
}
+EXPORT_SYMBOL(blk_put_queue);
void blk_cleanup_queue(struct request_queue *q)
{
@@ -566,6 +567,7 @@ int blk_get_queue(struct request_queue *
return 1;
}
+EXPORT_SYMBOL(blk_get_queue);
static inline void blk_free_request(struct request_queue *q, struct request *rq)
{

18
block-queue-refcount.patch
View File

@ -41,21 +41,3 @@ index e639125..e0bd3f7 100644
/* NULL queue means the device can't be used */
sdev->request_queue = NULL;
--- linux-2.6.38.noarch/block/blk-core.c~ 2011-06-07 15:29:26.000000000 -0400
+++ linux-2.6.38.noarch/block/blk-core.c 2011-06-07 15:29:49.000000000 -0400
@@ -456,6 +456,7 @@ void blk_put_queue(struct request_queue
{
kobject_put(&q->kobj);
}
+EXPORT_SYMBOL(blk_put_queue);
void blk_cleanup_queue(struct request_queue *q)
{
@@ -663,6 +664,7 @@ int blk_get_queue(struct request_queue *
return 1;
}
+EXPORT_SYMBOL(blk_get_queue);
static inline void blk_free_request(struct request_queue *q, struct request *rq)
{

5
kernel.spec
View File

@ -657,6 +657,7 @@ Patch570: linux-2.6-selinux-mprotect-checks.patch
Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
Patch600: block-queue-refcount.patch
Patch601: block-export-blk_-get-put-_queue.patch
Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
@ -1280,6 +1281,7 @@ ApplyPatch x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch
# SCSI Bits.
#
ApplyPatch block-queue-refcount.patch
ApplyPatch block-export-blk_-get-put-_queue.patch
# ACPI
@ -2021,6 +2023,9 @@ fi
# and build.
%changelog
* Fri Jun 24 2011 Chuck Ebbert <cebbert@redhat.com>
- Minor cleanup: use upstream patch to export block_{get,put}_queue
* Thu Jun 23 2011 Dave Airlie <airlied@redhat.com> 2.6.38.8-34
- drm-i915-snb-irq-stalls-fix.patch: fix Sandybridge IRQ stalls