[PATCH] Remove ->waiting member from struct request

As the comments indicates in blkdev.h, we can fold it into ->end_io_data
usage as that is really what ->waiting is. Fixup the users of
blk_end_sync_rq().

Signed-off-by: Jens Axboe <axboe@kernel.dk>

6 files changed, 12 insertions, 14 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index a360215dbce7..2568640430fb 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -3331,7 +3331,7 @@ static int DAC960_process_queue(DAC960_Controller_T *Controller, struct request_
                 Command->DmaDirection = PCI_DMA_TODEVICE;
                 Command->CommandType = DAC960_WriteCommand;
         }
-        Command->Completion = Request->waiting;
+        Command->Completion = Request->end_io_data;
         Command->LogicalDriveNumber = (long)Request->rq_disk->private_data;
         Command->BlockNumber = Request->sector;
         Command->BlockCount = Request->nr_sectors;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 12ff1a274d91..500d2ebb41e4 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -722,11 +722,10 @@ static int pd_special_command(struct pd_unit *disk,
         rq.rq_status = RQ_ACTIVE;
         rq.rq_disk = disk->gd;
         rq.ref_count = 1;
-        rq.waiting = &wait;
+        rq.end_io_data = &wait;
         rq.end_io = blk_end_sync_rq;
         blk_insert_request(disk->gd->queue, &rq, 0, func);
         wait_for_completion(&wait);
-        rq.waiting = NULL;
         if (rq.errors)
                 err = -EIO;
         blk_put_request(&rq);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 42891d2b054e..888d1aceeeff 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -375,7 +375,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
         rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);
 
         rq->ref_count++;
-        rq->waiting = &wait;
+        rq->end_io_data = &wait;
         rq->end_io = blk_end_sync_rq;
         elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);
         generic_unplug_device(q);
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 3436b1f104eb..a3ffb04436bd 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -141,7 +141,7 @@ enum {
 
 static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)
 {
-        struct request_pm_state *pm = rq->end_io_data;
+        struct request_pm_state *pm = rq->data;
 
         if (drive->media != ide_disk)
                 return;
@@ -164,7 +164,7 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s
 
 static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *rq)
 {
-        struct request_pm_state *pm = rq->end_io_data;
+        struct request_pm_state *pm = rq->data;
         ide_task_t *args = rq->special;
 
         memset(args, 0, sizeof(*args));
@@ -421,7 +421,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                         }
                 }
         } else if (blk_pm_request(rq)) {
-                struct request_pm_state *pm = rq->end_io_data;
+                struct request_pm_state *pm = rq->data;
 #ifdef DEBUG_PM
                 printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",
                         drive->name, rq->pm->pm_step, stat, err);
@@ -933,7 +933,7 @@ done:
 
 static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
 {
-        struct request_pm_state *pm = rq->end_io_data;
+        struct request_pm_state *pm = rq->data;
 
         if (blk_pm_suspend_request(rq) &&
             pm->pm_step == ide_pm_state_start_suspend)
@@ -1018,7 +1018,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                     rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
                         return execute_drive_cmd(drive, rq);
                 else if (blk_pm_request(rq)) {
-                        struct request_pm_state *pm = rq->end_io_data;
+                        struct request_pm_state *pm = rq->data;
 #ifdef DEBUG_PM
                         printk("%s: start_power_step(step: %d)\n",
                                 drive->name, rq->pm->pm_step);
@@ -1718,7 +1718,7 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
          */
         if (must_wait) {
                 rq->ref_count++;
-                rq->waiting = &wait;
+                rq->end_io_data = &wait;
                 rq->end_io = blk_end_sync_rq;
         }
 
@@ -1736,7 +1736,6 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
         err = 0;
         if (must_wait) {
                 wait_for_completion(&wait);
-                rq->waiting = NULL;
                 if (rq->errors)
                         err = -EIO;
 
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 643e4b9ac651..66f9678d2f10 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2773,7 +2773,7 @@ static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq)
                 return;
         }
 #endif /* IDETAPE_DEBUG_BUGS */
-        rq->waiting = &wait;
+        rq->end_io_data = &wait;
         rq->end_io = blk_end_sync_rq;
         spin_unlock_irq(&tape->spinlock);
         wait_for_completion(&wait);
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9384a3fdde6c..2b1a1389c318 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1219,7 +1219,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
         memset(&args, 0, sizeof(args));
         rq.cmd_type = REQ_TYPE_PM_SUSPEND;
         rq.special = &args;
-        rq.end_io_data = &rqpm;
+        rq.data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
         if (mesg.event == PM_EVENT_PRETHAW)
                 mesg.event = PM_EVENT_FREEZE;
@@ -1240,7 +1240,7 @@ static int generic_ide_resume(struct device *dev)
         memset(&args, 0, sizeof(args));
         rq.cmd_type = REQ_TYPE_PM_RESUME;
         rq.special = &args;
-        rq.end_io_data = &rqpm;
+        rq.data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_resume;
         rqpm.pm_state = PM_EVENT_ON;