11 files changed, 37 insertions, 60 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 30156aa61016..c3fd528a1b4d 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -410,7 +410,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                                 if (rq->errors == 0)
                                         rq->errors = -EIO;
                         }
-                        ide_end_request(drive, uptodate, 0);
+                        ide_complete_rq(drive, uptodate ? 0 : -EIO,
+                                        ide_rq_bytes(rq));
                 }
 
                 return ide_stopped;
@@ -469,7 +470,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
                 /* FIXME: don't do partial completions */
                 if (drive->media == ide_floppy)
-                        ide_end_request(drive, 1, done >> 9);
+                        ide_complete_rq(drive, 0,
+                                        done ? done : ide_rq_bytes(rq));
         } else
                 xferfunc(drive, NULL, pc->cur_pos, bcount);
 
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index e4fa807fdcfa..2f698c6e913f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -298,7 +298,7 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
         if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
                 rq->errors = -EIO;
 
-        ide_end_request(drive, uptodate, nsectors);
+        ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
 }
 
 static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
@@ -793,10 +793,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 if (dma_error)
                         return ide_error(drive, "dma error", stat);
                 if (blk_fs_request(rq)) {
-                        ide_end_request(drive, 1, rq->nr_sectors);
+                        ide_complete_rq(drive, 0, rq->nr_sectors
+                                ? (rq->nr_sectors << 9) : ide_rq_bytes(rq));
                         return ide_stopped;
                 } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
-                        ide_end_request(drive, 1, 1);
+                        ide_complete_rq(drive, 0, 512);
                         return ide_stopped;
                 }
                 goto end_request;
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 7c3953414d47..5bf958e5b1d5 100644
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -183,8 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)
         err = setfunc(drive, *(int *)&rq->cmd[1]);
         if (err)
                 rq->errors = err;
-        else
-                err = 1;
-        ide_end_request(drive, err, 0);
+        ide_complete_rq(drive, err, ide_rq_bytes(rq));
         return ide_stopped;
 }
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index ad9a3f54d21d..d8caa65ca7a5 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                 blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
                 if (rq->errors == 0)
                         rq->errors = -EIO;
-                ide_end_request(drive, 0, 0);
+                ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
                 return ide_stopped;
         }
 
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 820e5104ba47..8f5e32e692f0 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -101,7 +101,8 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
                         if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
                                 ide_finish_cmd(drive, cmd, stat);
                         else
-                                ide_end_request(drive, 1, cmd->rq->nr_sectors);
+                                ide_complete_rq(drive, 0,
+                                                cmd->rq->nr_sectors << 9);
                         return ide_stopped;
                 }
                 printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index ccfd06ef5bb9..aff1a9b04559 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -149,7 +149,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err)
         if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {
                 if (err <= 0 && rq->errors == 0)
                         rq->errors = -EIO;
-                ide_end_request(drive, err ? err : 1, 0);
+                ide_complete_rq(drive, err ? err : 0, ide_rq_bytes(rq));
         }
 }
 
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 7ef2b90e530a..8c518c6a6477 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -68,7 +68,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
         struct bio *bio = rq->bio;
 
         while ((bio = rq->bio) != NULL)
-                ide_end_request(drive, 1, 0);
+                ide_complete_rq(drive, 0, ide_rq_bytes(rq));
 }
 
 static int ide_floppy_callback(ide_drive_t *drive, int dsc)
@@ -300,7 +300,7 @@ out_end:
         drive->failed_pc = NULL;
         if (blk_fs_request(rq) == 0 && rq->errors == 0)
                 rq->errors = -EIO;
-        ide_end_request(drive, 0, 0);
+        ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
         return ide_stopped;
 }
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8e2868617a46..f59c709052d2 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -71,48 +71,6 @@ int ide_end_rq(ide_drive_t *drive, struct request *rq, int error,
 }
 EXPORT_SYMBOL_GPL(ide_end_rq);
 
-/**
- *      ide_end_request         -       complete an IDE I/O
- *      @drive: IDE device for the I/O
- *      @uptodate:
- *      @nr_sectors: number of sectors completed
- *
- *      This is our end_request wrapper function. We complete the I/O
- *      update random number input and dequeue the request, which if
- *      it was tagged may be out of order.
- */
-
-int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
-{
-        unsigned int nr_bytes = nr_sectors << 9;
-        struct request *rq = drive->hwif->rq;
-        int rc, error = 0;
-
-        if (!nr_bytes) {
-                if (blk_pc_request(rq))
-                        nr_bytes = rq->data_len;
-                else
-                        nr_bytes = rq->hard_cur_sectors << 9;
-        }
-
-        /*
-         * if failfast is set on a request, override number of sectors
-         * and complete the whole request right now
-         */
-        if (blk_noretry_request(rq) && uptodate <= 0)
-                nr_bytes = rq->hard_nr_sectors << 9;
-
-        if (uptodate <= 0)
-                error = uptodate ? uptodate : -EIO;
-
-        rc = ide_end_rq(drive, rq, error, nr_bytes);
-        if (rc == 0)
-                drive->hwif->rq = NULL;
-
-        return rc;
-}
-EXPORT_SYMBOL(ide_end_request);
-
 void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 {
         struct ide_taskfile *tf = &cmd->tf;
@@ -141,12 +99,29 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
                 kfree(cmd);
 }
 
+/* obsolete, blk_rq_bytes() should be used instead */
+unsigned int ide_rq_bytes(struct request *rq)
+{
+        if (blk_pc_request(rq))
+                return rq->data_len;
+        else
+                return rq->hard_cur_sectors << 9;
+}
+EXPORT_SYMBOL_GPL(ide_rq_bytes);
+
 int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->rq;
         int rc;
 
+        /*
+         * if failfast is set on a request, override number of sectors
+         * and complete the whole request right now
+         */
+        if (blk_noretry_request(rq) && error <= 0)
+                nr_bytes = rq->hard_nr_sectors << 9;
+
         rc = ide_end_rq(drive, rq, error, nr_bytes);
         if (rc == 0)
                 hwif->rq = NULL;
@@ -170,7 +145,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
                         rq->errors = IDE_DRV_ERROR_GENERAL;
                 else if (blk_fs_request(rq) == 0 && rq->errors == 0)
                         rq->errors = -EIO;
-                ide_end_request(drive, 0, 0);
+                ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
         }
 }
 
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 2df708927687..853d047aa78f 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -762,7 +762,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                         "request queue (%d)\n", drive->name, rq->cmd_type);
                 if (blk_fs_request(rq) == 0 && rq->errors == 0)
                         rq->errors = -EIO;
-                ide_end_request(drive, 0, 0);
+                ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
                 return ide_stopped;
         }
 
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b9d7ba2c8a00..db6d7821e45b 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -283,7 +283,7 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
                 }
 
                 if (sectors > 0)
-                        ide_end_request(drive, 1, sectors);
+                        ide_complete_rq(drive, 0, sectors << 9);
         }
 }
 
@@ -352,7 +352,7 @@ out_end:
         if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
                 ide_finish_cmd(drive, cmd, stat);
         else
-                ide_end_request(drive, 1, cmd->rq->nr_sectors);
+                ide_complete_rq(drive, 0, cmd->rq->nr_sectors << 9);
         return ide_stopped;
 out_err:
         ide_error_cmd(drive, cmd);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index cbfb64fdeda7..b6142171baf0 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1131,8 +1131,8 @@ int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned l
 extern int ide_vlb_clk;
 extern int ide_pci_clk;
 
+unsigned int ide_rq_bytes(struct request *);
 int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
-int ide_end_request(ide_drive_t *, int, int);
 void ide_kill_rq(ide_drive_t *, struct request *);
 
 void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int,