ide: use __generic_unplug_device() in ide_do_drive_cmd() (take 2)

[firefly-linux-kernel-4.4.55.git] / drivers / ide / ide-io.c

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 788783da9025804eb5af6e6f02134f7efbd411ba..1eb3f5cce556194580c69951816e0cc968bc8a5a 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1550,8 +1550,7 @@ irqreturn_t ide_intr (int irq, void *dev_id)
 
 void ide_init_drive_cmd (struct request *rq)
 {
-       memset(rq, 0, sizeof(*rq));
-       rq->ref_count = 1;
+       blk_rq_init(NULL, rq);
 }
 
 EXPORT_SYMBOL(ide_init_drive_cmd);
@@ -1601,15 +1600,17 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
                rq->end_io = blk_end_sync_rq;
        }
 
+       if (action == ide_preempt || action == ide_head_wait)
+               where = ELEVATOR_INSERT_FRONT;
+
        spin_lock_irqsave(&ide_lock, flags);
        if (action == ide_preempt)
                hwgroup->rq = NULL;
-       if (action == ide_preempt || action == ide_head_wait) {
-               where = ELEVATOR_INSERT_FRONT;
-               rq->cmd_flags |= REQ_PREEMPT;
-       }
-       __elv_add_request(drive->queue, rq, where, 0);
-       ide_do_request(hwgroup, IDE_NO_IRQ);
+       __elv_add_request(drive->queue, rq, where, 1);
+       __generic_unplug_device(drive->queue);
+       /* the queue is stopped so it won't be plugged+unplugged */
+       if (blk_pm_resume_request(rq))
+               do_ide_request(drive->queue);
        spin_unlock_irqrestore(&ide_lock, flags);
 
        err = 0;