2 files changed, 50 insertions, 30 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 44b033ec0ab0..74c6087ada38 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -655,9 +655,9 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate)
                                         BUG();
                         } else {
                                 spin_lock_irqsave(&ide_lock, flags);
-                                end_that_request_chunk(failed, 0,
-                                                        failed->data_len);
-                                end_that_request_last(failed, 0);
+                                if (__blk_end_request(failed, -EIO,
+                                                      failed->data_len))
+                                        BUG();
                                 spin_unlock_irqrestore(&ide_lock, flags);
                         }
                 } else
@@ -1647,6 +1647,17 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
         return 1;
 }
 
+/*
+ * Called from blk_end_request_callback() after the data of the request
+ * is completed and before the request is completed.
+ * By returning value '1', blk_end_request_callback() returns immediately
+ * without completing the request.
+ */
+static int cdrom_newpc_intr_dummy_cb(struct request *rq)
+{
+        return 1;
+}
+
 typedef void (xfer_func_t)(ide_drive_t *, void *, u32);
 
 /*
@@ -1685,9 +1696,13 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                         return ide_error(drive, "dma error", stat);
                 }
 
-                end_that_request_chunk(rq, 1, rq->data_len);
-                rq->data_len = 0;
-                goto end_request;
+                spin_lock_irqsave(&ide_lock, flags);
+                if (__blk_end_request(rq, 0, rq->data_len))
+                        BUG();
+                HWGROUP(drive)->rq = NULL;
+                spin_unlock_irqrestore(&ide_lock, flags);
+
+                return ide_stopped;
         }
 
         /*
@@ -1705,8 +1720,15 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         /*
          * If DRQ is clear, the command has completed.
          */
-        if ((stat & DRQ_STAT) == 0)
-                goto end_request;
+        if ((stat & DRQ_STAT) == 0) {
+                spin_lock_irqsave(&ide_lock, flags);
+                if (__blk_end_request(rq, 0, 0))
+                        BUG();
+                HWGROUP(drive)->rq = NULL;
+                spin_unlock_irqrestore(&ide_lock, flags);
+
+                return ide_stopped;
+        }
 
         /*
          * check which way to transfer data
@@ -1759,7 +1781,14 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 rq->data_len -= blen;
 
                 if (rq->bio)
-                        end_that_request_chunk(rq, 1, blen);
+                        /*
+                         * The request can't be completed until DRQ is cleared.
+                         * So complete the data, but don't complete the request
+                         * using the dummy function for the callback feature
+                         * of blk_end_request_callback().
+                         */
+                        blk_end_request_callback(rq, 0, blen,
+                                                 cdrom_newpc_intr_dummy_cb);
                 else
                         rq->data += blen;
         }
@@ -1780,14 +1809,6 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
         ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL);
         return ide_started;
-
-end_request:
-        spin_lock_irqsave(&ide_lock, flags);
-        blkdev_dequeue_request(rq);
-        end_that_request_last(rq, 1);
-        HWGROUP(drive)->rq = NULL;
-        spin_unlock_irqrestore(&ide_lock, flags);
-        return ide_stopped;
 }
 
 static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 6f8f544392a8..e6bb9cf24e3d 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -58,15 +58,19 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
                              int uptodate, unsigned int nr_bytes, int dequeue)
 {
         int ret = 1;
+        int error = 0;
+
+        if (uptodate <= 0)
+                error = uptodate ? uptodate : -EIO;
 
         /*
          * if failfast is set on a request, override number of sectors and
          * complete the whole request right now
          */
-        if (blk_noretry_request(rq) && end_io_error(uptodate))
+        if (blk_noretry_request(rq) && error)
                 nr_bytes = rq->hard_nr_sectors << 9;
 
-        if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors)
+        if (!blk_fs_request(rq) && error && !rq->errors)
                 rq->errors = -EIO;
 
         /*
@@ -78,14 +82,9 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
                 ide_dma_on(drive);
         }
 
-        if (!end_that_request_chunk(rq, uptodate, nr_bytes)) {
-                add_disk_randomness(rq->rq_disk);
-                if (dequeue) {
-                        if (!list_empty(&rq->queuelist))
-                                blkdev_dequeue_request(rq);
+        if (!__blk_end_request(rq, error, nr_bytes)) {
+                if (dequeue)
                         HWGROUP(drive)->rq = NULL;
-                }
-                end_that_request_last(rq, uptodate);
                 ret = 0;
         }
 
@@ -290,9 +289,9 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq)
                 drive->blocked = 0;
                 blk_start_queue(drive->queue);
         }
-        blkdev_dequeue_request(rq);
         HWGROUP(drive)->rq = NULL;
-        end_that_request_last(rq, 1);
+        if (__blk_end_request(rq, 0, 0))
+                BUG();
         spin_unlock_irqrestore(&ide_lock, flags);
 }
 
@@ -387,10 +386,10 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
         }
 
         spin_lock_irqsave(&ide_lock, flags);
-        blkdev_dequeue_request(rq);
         HWGROUP(drive)->rq = NULL;
         rq->errors = err;
-        end_that_request_last(rq, !rq->errors);
+        if (__blk_end_request(rq, (rq->errors ? -EIO : 0), 0))
+                BUG();
         spin_unlock_irqrestore(&ide_lock, flags);
 }