Merge branch 'blk-end-request' of git://git.kernel.dk/linux-2.6-block

* 'blk-end-request' of git://git.kernel.dk/linux-2.6-block: (30 commits)
  blk_end_request: changing xsysace (take 4)
  blk_end_request: changing ub (take 4)
  blk_end_request: cleanup of request completion (take 4)
  blk_end_request: cleanup 'uptodate' related code (take 4)
  blk_end_request: remove/unexport end_that_request_* (take 4)
  blk_end_request: changing scsi (take 4)
  blk_end_request: add bidi completion interface (take 4)
  blk_end_request: changing ide-cd (take 4)
  blk_end_request: add callback feature (take 4)
  blk_end_request: changing ide normal caller (take 4)
  blk_end_request: changing cpqarray (take 4)
  blk_end_request: changing cciss (take 4)
  blk_end_request: changing ide-scsi (take 4)
  blk_end_request: changing s390 (take 4)
  blk_end_request: changing mmc (take 4)
  blk_end_request: changing i2o_block (take 4)
  blk_end_request: changing viocd (take 4)
  blk_end_request: changing xen-blkfront (take 4)
  blk_end_request: changing viodasd (take 4)
  blk_end_request: changing sx8 (take 4)
  ...

1 files changed, 12 insertions, 13 deletions

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);
 }