[BLOCK] Get rid of request_queue_t typedef

[deliverable/linux.git] / drivers / mmc / card / queue.c

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 4fb2089dc6900cb1399496defcf8184b106cdbd0..e02eac876362e399e16bb50265dc01b662507f71 100644 (file)
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -11,6 +11,7 @@
  */
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/freezer.h>
 #include <linux/kthread.h>
 
 #include <linux/mmc/card.h>
@@ -44,11 +45,7 @@ static int mmc_queue_thread(void *d)
        struct mmc_queue *mq = d;
        struct request_queue *q = mq->queue;
 
-       /*
-        * Set iothread to ensure that we aren't put to sleep by
-        * the process freezing.  We handle suspension ourselves.
-        */
-       current->flags |= PF_MEMALLOC|PF_NOFREEZE;
+       current->flags |= PF_MEMALLOC;
 
        down(&mq->thread_sem);
        do {
@@ -86,7 +83,7 @@ static int mmc_queue_thread(void *d)
  * on any queue on this host, and attempt to issue it.  This may
  * not be the queue we were asked to process.
  */
-static void mmc_request(request_queue_t *q)
+static void mmc_request(struct request_queue *q)
 {
        struct mmc_queue *mq = q->queuedata;
        struct request *req;
@@ -214,7 +211,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
 
 void mmc_cleanup_queue(struct mmc_queue *mq)
 {
-       request_queue_t *q = mq->queue;
+       struct request_queue *q = mq->queue;
        unsigned long flags;
 
        /* Mark that we should start throwing out stragglers */
@@ -255,7 +252,7 @@ EXPORT_SYMBOL(mmc_cleanup_queue);
  */
 void mmc_queue_suspend(struct mmc_queue *mq)
 {
-       request_queue_t *q = mq->queue;
+       struct request_queue *q = mq->queue;
        unsigned long flags;
 
        if (!(mq->flags & MMC_QUEUE_SUSPENDED)) {
@@ -275,7 +272,7 @@ void mmc_queue_suspend(struct mmc_queue *mq)
  */
 void mmc_queue_resume(struct mmc_queue *mq)
 {
-       request_queue_t *q = mq->queue;
+       struct request_queue *q = mq->queue;
        unsigned long flags;
 
        if (mq->flags & MMC_QUEUE_SUSPENDED) {