[kernel/f15] Minor cleanup: use upstream patch to export block_{get, put}_queue

[Chuck Ebbert]

commit ce8c06713657669302eb56d5751124d8709f18fc
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Jun 24 00:37:15 2011 -0400

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

 block-export-blk_-get-put-_queue.patch |   39 ++++++++++++++++++++++++++++++++
 block-queue-refcount.patch             |   18 --------------
 kernel.spec                            |    5 ++++
 3 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/block-export-blk_-get-put-_queue.patch b/block-export-blk_-get-put-_queue.patch
new file mode 100644
index 0000000..05db7bd
--- /dev/null
+++ b/block-export-blk_-get-put-_queue.patch
@@ -0,0 +1,39 @@
+From d86e0e83b32bc84600adb0b6ea1fce389b266682 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <jaxboe at fusionio.com>
+Date: Fri, 27 May 2011 07:44:43 +0200
+Subject: block: export blk_{get,put}_queue()
+
+From: Jens Axboe <jaxboe at 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 at fusionio.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Chuck Ebbert <cebbert at 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)
+ {
diff --git a/block-queue-refcount.patch b/block-queue-refcount.patch
index c0f09a4..d53dd1b 100644
--- a/block-queue-refcount.patch
+++ b/block-queue-refcount.patch
@@ -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)
- {
diff --git a/kernel.spec b/kernel.spec
index 7b43256..17efa77 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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 at redhat.com>
+- Minor cleanup: use upstream patch to export block_{get,put}_queue
+
 * Thu Jun 23 2011 Dave Airlie <airlied at redhat.com> 2.6.38.8-34
 - drm-i915-snb-irq-stalls-fix.patch: fix Sandybridge IRQ stalls