12 files changed, 74 insertions, 143 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 9030c373ce67..cd03473f3547 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -3455,19 +3455,12 @@ static inline bool DAC960_ProcessCompletedRequest(DAC960_Command_T *Command,
                                                  bool SuccessfulIO)
 {
         struct request *Request = Command->Request;
-        int UpToDate;
-
-        UpToDate = 0;
-        if (SuccessfulIO)
-                UpToDate = 1;
+        int Error = SuccessfulIO ? 0 : -EIO;
 
         pci_unmap_sg(Command->Controller->PCIDevice, Command->cmd_sglist,
                 Command->SegmentCount, Command->DmaDirection);
 
-         if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) {
-                add_disk_randomness(Request->rq_disk);
-                end_that_request_last(Request, UpToDate);
-
+         if (!__blk_end_request(Request, Error, Command->BlockCount << 9)) {
                 if (Command->Completion) {
                         complete(Command->Completion);
                         Command->Completion = NULL;
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 509b6490413b..ef50068def88 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1187,17 +1187,6 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
         }
 }
 
-static inline void complete_buffers(struct bio *bio, int status)
-{
-        while (bio) {
-                struct bio *xbh = bio->bi_next;
-
-                bio->bi_next = NULL;
-                bio_endio(bio, status ? 0 : -EIO);
-                bio = xbh;
-        }
-}
-
 static void cciss_check_queues(ctlr_info_t *h)
 {
         int start_queue = h->next_to_run;
@@ -1263,21 +1252,14 @@ static void cciss_softirq_done(struct request *rq)
                 pci_unmap_page(h->pdev, temp64.val, cmd->SG[i].Len, ddir);
         }
 
-        complete_buffers(rq->bio, (rq->errors == 0));
-
-        if (blk_fs_request(rq)) {
-                const int rw = rq_data_dir(rq);
-
-                disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
-        }
-
 #ifdef CCISS_DEBUG
         printk("Done with %p\n", rq);
 #endif                          /* CCISS_DEBUG */
 
-        add_disk_randomness(rq->rq_disk);
+        if (blk_end_request(rq, (rq->errors == 0) ? 0 : -EIO, blk_rq_bytes(rq)))
+                BUG();
+
         spin_lock_irqsave(&h->lock, flags);
-        end_that_request_last(rq, (rq->errors == 0));
         cmd_free(h, cmd, 1);
         cciss_check_queues(h);
         spin_unlock_irqrestore(&h->lock, flags);
@@ -2544,7 +2526,6 @@ after_error_processing:
         }
         cmd->rq->data_len = 0;
         cmd->rq->completion_data = cmd;
-        blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE);
         blk_complete_request(cmd->rq);
 }
 
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index c8132d958795..69199185ff4b 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -167,7 +167,6 @@ static void start_io(ctlr_info_t *h);
 
 static inline void addQ(cmdlist_t **Qptr, cmdlist_t *c);
 static inline cmdlist_t *removeQ(cmdlist_t **Qptr, cmdlist_t *c);
-static inline void complete_buffers(struct bio *bio, int ok);
 static inline void complete_command(cmdlist_t *cmd, int timeout);
 
 static irqreturn_t do_ida_intr(int irq, void *dev_id);
@@ -980,26 +979,13 @@ static void start_io(ctlr_info_t *h)
         }
 }
 
-static inline void complete_buffers(struct bio *bio, int ok)
-{
-        struct bio *xbh;
-
-        while (bio) {
-                xbh = bio->bi_next;
-                bio->bi_next = NULL;
-                
-                bio_endio(bio, ok ? 0 : -EIO);
-
-                bio = xbh;
-        }
-}
 /*
  * Mark all buffers that cmd was responsible for
  */
 static inline void complete_command(cmdlist_t *cmd, int timeout)
 {
         struct request *rq = cmd->rq;
-        int ok=1;
+        int error = 0;
         int i, ddir;
 
         if (cmd->req.hdr.rcode & RCODE_NONFATAL &&
@@ -1011,16 +997,17 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
         if (cmd->req.hdr.rcode & RCODE_FATAL) {
                 printk(KERN_WARNING "Fatal error on ida/c%dd%d\n",
                                 cmd->ctlr, cmd->hdr.unit);
-                ok = 0;
+                error = -EIO;
         }
         if (cmd->req.hdr.rcode & RCODE_INVREQ) {
                                 printk(KERN_WARNING "Invalid request on ida/c%dd%d = (cmd=%x sect=%d cnt=%d sg=%d ret=%x)\n",
                                 cmd->ctlr, cmd->hdr.unit, cmd->req.hdr.cmd,
                                 cmd->req.hdr.blk, cmd->req.hdr.blk_cnt,
                                 cmd->req.hdr.sg_cnt, cmd->req.hdr.rcode);
-                ok = 0; 
+                error = -EIO;
         }
-        if (timeout) ok = 0;
+        if (timeout)
+                error = -EIO;
         /* unmap the DMA mapping for all the scatter gather elements */
         if (cmd->req.hdr.cmd == IDA_READ)
                 ddir = PCI_DMA_FROMDEVICE;
@@ -1030,18 +1017,9 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
                 pci_unmap_page(hba[cmd->ctlr]->pci_dev, cmd->req.sg[i].addr,
                                 cmd->req.sg[i].size, ddir);
 
-        complete_buffers(rq->bio, ok);
-
-        if (blk_fs_request(rq)) {
-                const int rw = rq_data_dir(rq);
-
-                disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
-        }
-
-        add_disk_randomness(rq->rq_disk);
-
         DBGPX(printk("Done with %p\n", rq););
-        end_that_request_last(rq, ok ? 1 : -EIO);
+        if (__blk_end_request(rq, error, blk_rq_bytes(rq)))
+                BUG();
 }
 
 /*
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 639ed14bb08d..32c79a55511b 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2287,21 +2287,19 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
  * =============================
  */
 
-static void floppy_end_request(struct request *req, int uptodate)
+static void floppy_end_request(struct request *req, int error)
 {
         unsigned int nr_sectors = current_count_sectors;
+        unsigned int drive = (unsigned long)req->rq_disk->private_data;
 
         /* current_count_sectors can be zero if transfer failed */
-        if (!uptodate)
+        if (error)
                 nr_sectors = req->current_nr_sectors;
-        if (end_that_request_first(req, uptodate, nr_sectors))
+        if (__blk_end_request(req, error, nr_sectors << 9))
                 return;
-        add_disk_randomness(req->rq_disk);
-        floppy_off((long)req->rq_disk->private_data);
-        blkdev_dequeue_request(req);
-        end_that_request_last(req, uptodate);
 
         /* We're done with the request */
+        floppy_off(drive);
         current_req = NULL;
 }
 
@@ -2332,7 +2330,7 @@ static void request_done(int uptodate)
 
                 /* unlock chained buffers */
                 spin_lock_irqsave(q->queue_lock, flags);
-                floppy_end_request(req, 1);
+                floppy_end_request(req, 0);
                 spin_unlock_irqrestore(q->queue_lock, flags);
         } else {
                 if (rq_data_dir(req) == WRITE) {
@@ -2346,7 +2344,7 @@ static void request_done(int uptodate)
                         DRWE->last_error_generation = DRS->generation;
                 }
                 spin_lock_irqsave(q->queue_lock, flags);
-                floppy_end_request(req, 0);
+                floppy_end_request(req, -EIO);
                 spin_unlock_irqrestore(q->queue_lock, flags);
         }
 }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ba9b17e507e0..ae3106045ee5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -100,17 +100,15 @@ static const char *nbdcmd_to_ascii(int cmd)
 
 static void nbd_end_request(struct request *req)
 {
-        int uptodate = (req->errors == 0) ? 1 : 0;
+        int error = req->errors ? -EIO : 0;
         struct request_queue *q = req->q;
         unsigned long flags;
 
         dprintk(DBG_BLKDEV, "%s: request %p: %s\n", req->rq_disk->disk_name,
-                        req, uptodate? "done": "failed");
+                        req, error ? "failed" : "done");
 
         spin_lock_irqsave(q->queue_lock, flags);
-        if (!end_that_request_first(req, uptodate, req->nr_sectors)) {
-                end_that_request_last(req, uptodate);
-        }
+        __blk_end_request(req, error, req->nr_sectors << 9);
         spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index e354bfc070e1..7483f947f0e9 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -229,7 +229,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
         struct ps3_storage_device *dev = data;
         struct ps3disk_private *priv;
         struct request *req;
-        int res, read, uptodate;
+        int res, read, error;
         u64 tag, status;
         unsigned long num_sectors;
         const char *op;
@@ -270,21 +270,17 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
         if (status) {
                 dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__,
                         __LINE__, op, status);
-                uptodate = 0;
+                error = -EIO;
         } else {
                 dev_dbg(&dev->sbd.core, "%s:%u: %s completed\n", __func__,
                         __LINE__, op);
-                uptodate = 1;
+                error = 0;
                 if (read)
                         ps3disk_scatter_gather(dev, req, 0);
         }
 
         spin_lock(&priv->lock);
-        if (!end_that_request_first(req, uptodate, num_sectors)) {
-                add_disk_randomness(req->rq_disk);
-                blkdev_dequeue_request(req);
-                end_that_request_last(req, uptodate);
-        }
+        __blk_end_request(req, error, num_sectors << 9);
         priv->req = NULL;
         ps3disk_do_request(dev, priv->queue);
         spin_unlock(&priv->lock);
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index fac4c6cd04f7..66e30155b0ab 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -212,12 +212,9 @@ static void vdc_end_special(struct vdc_port *port, struct vio_disk_desc *desc)
         vdc_finish(&port->vio, -err, WAITING_FOR_GEN_CMD);
 }
 
-static void vdc_end_request(struct request *req, int uptodate, int num_sectors)
+static void vdc_end_request(struct request *req, int error, int num_sectors)
 {
-        if (end_that_request_first(req, uptodate, num_sectors))
-                return;
-        add_disk_randomness(req->rq_disk);
-        end_that_request_last(req, uptodate);
+        __blk_end_request(req, error, num_sectors << 9);
 }
 
 static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr,
@@ -242,7 +239,7 @@ static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr,
 
         rqe->req = NULL;
 
-        vdc_end_request(req, !desc->status, desc->size >> 9);
+        vdc_end_request(req, (desc->status ? -EIO : 0), desc->size >> 9);
 
         if (blk_queue_stopped(port->disk->queue))
                 blk_start_queue(port->disk->queue);
@@ -456,7 +453,7 @@ static void do_vdc_request(struct request_queue *q)
 
                 blkdev_dequeue_request(req);
                 if (__send_request(req) < 0)
-                        vdc_end_request(req, 0, req->hard_nr_sectors);
+                        vdc_end_request(req, -EIO, req->hard_nr_sectors);
         }
 }
 
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 52dc5e131718..cd5674b63faf 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -744,16 +744,14 @@ static unsigned int carm_fill_get_fw_ver(struct carm_host *host,
 
 static inline void carm_end_request_queued(struct carm_host *host,
                                            struct carm_request *crq,
-                                           int uptodate)
+                                           int error)
 {
         struct request *req = crq->rq;
         int rc;
 
-        rc = end_that_request_first(req, uptodate, req->hard_nr_sectors);
+        rc = __blk_end_request(req, error, blk_rq_bytes(req));
         assert(rc == 0);
 
-        end_that_request_last(req, uptodate);
-
         rc = carm_put_request(host, crq);
         assert(rc == 0);
 }
@@ -793,9 +791,9 @@ static inline void carm_round_robin(struct carm_host *host)
 }
 
 static inline void carm_end_rq(struct carm_host *host, struct carm_request *crq,
-                        int is_ok)
+                               int error)
 {
-        carm_end_request_queued(host, crq, is_ok);
+        carm_end_request_queued(host, crq, error);
         if (max_queue == 1)
                 carm_round_robin(host);
         else if ((host->n_msgs <= CARM_MSG_LOW_WATER) &&
@@ -873,14 +871,14 @@ queue_one_request:
         sg = &crq->sg[0];
         n_elem = blk_rq_map_sg(q, rq, sg);
         if (n_elem <= 0) {
-                carm_end_rq(host, crq, 0);
+                carm_end_rq(host, crq, -EIO);
                 return;         /* request with no s/g entries? */
         }
 
         /* map scatterlist to PCI bus addresses */
         n_elem = pci_map_sg(host->pdev, sg, n_elem, pci_dir);
         if (n_elem <= 0) {
-                carm_end_rq(host, crq, 0);
+                carm_end_rq(host, crq, -EIO);
                 return;         /* request with no s/g entries? */
         }
         crq->n_elem = n_elem;
@@ -941,7 +939,7 @@ queue_one_request:
 
 static void carm_handle_array_info(struct carm_host *host,
                                    struct carm_request *crq, u8 *mem,
-                                   int is_ok)
+                                   int error)
 {
         struct carm_port *port;
         u8 *msg_data = mem + sizeof(struct carm_array_info);
@@ -952,9 +950,9 @@ static void carm_handle_array_info(struct carm_host *host,
 
         DPRINTK("ENTER\n");
 
-        carm_end_rq(host, crq, is_ok);
+        carm_end_rq(host, crq, error);
 
-        if (!is_ok)
+        if (error)
                 goto out;
         if (le32_to_cpu(desc->array_status) & ARRAY_NO_EXIST)
                 goto out;
@@ -1001,7 +999,7 @@ out:
 
 static void carm_handle_scan_chan(struct carm_host *host,
                                   struct carm_request *crq, u8 *mem,
-                                  int is_ok)
+                                  int error)
 {
         u8 *msg_data = mem + IOC_SCAN_CHAN_OFFSET;
         unsigned int i, dev_count = 0;
@@ -1009,9 +1007,9 @@ static void carm_handle_scan_chan(struct carm_host *host,
 
         DPRINTK("ENTER\n");
 
-        carm_end_rq(host, crq, is_ok);
+        carm_end_rq(host, crq, error);
 
-        if (!is_ok) {
+        if (error) {
                 new_state = HST_ERROR;
                 goto out;
         }
@@ -1033,23 +1031,23 @@ out:
 }
 
 static void carm_handle_generic(struct carm_host *host,
-                                struct carm_request *crq, int is_ok,
+                                struct carm_request *crq, int error,
                                 int cur_state, int next_state)
 {
         DPRINTK("ENTER\n");
 
-        carm_end_rq(host, crq, is_ok);
+        carm_end_rq(host, crq, error);
 
         assert(host->state == cur_state);
-        if (is_ok)
-                host->state = next_state;
-        else
+        if (error)
                 host->state = HST_ERROR;
+        else
+                host->state = next_state;
         schedule_work(&host->fsm_task);
 }
 
 static inline void carm_handle_rw(struct carm_host *host,
-                                  struct carm_request *crq, int is_ok)
+                                  struct carm_request *crq, int error)
 {
         int pci_dir;
 
@@ -1062,7 +1060,7 @@ static inline void carm_handle_rw(struct carm_host *host,
 
         pci_unmap_sg(host->pdev, &crq->sg[0], crq->n_elem, pci_dir);
 
-        carm_end_rq(host, crq, is_ok);
+        carm_end_rq(host, crq, error);
 }
 
 static inline void carm_handle_resp(struct carm_host *host,
@@ -1071,7 +1069,7 @@ static inline void carm_handle_resp(struct carm_host *host,
         u32 handle = le32_to_cpu(ret_handle_le);
         unsigned int msg_idx;
         struct carm_request *crq;
-        int is_ok = (status == RMSG_OK);
+        int error = (status == RMSG_OK) ? 0 : -EIO;
         u8 *mem;
 
         VPRINTK("ENTER, handle == 0x%x\n", handle);
@@ -1090,7 +1088,7 @@ static inline void carm_handle_resp(struct carm_host *host,
         /* fast path */
         if (likely(crq->msg_type == CARM_MSG_READ ||
                    crq->msg_type == CARM_MSG_WRITE)) {
-                carm_handle_rw(host, crq, is_ok);
+                carm_handle_rw(host, crq, error);
                 return;
         }
 
@@ -1100,7 +1098,7 @@ static inline void carm_handle_resp(struct carm_host *host,
         case CARM_MSG_IOCTL: {
                 switch (crq->msg_subtype) {
                 case CARM_IOC_SCAN_CHAN:
-                        carm_handle_scan_chan(host, crq, mem, is_ok);
+                        carm_handle_scan_chan(host, crq, mem, error);
                         break;
                 default:
                         /* unknown / invalid response */
@@ -1112,21 +1110,21 @@ static inline void carm_handle_resp(struct carm_host *host,
         case CARM_MSG_MISC: {
                 switch (crq->msg_subtype) {
                 case MISC_ALLOC_MEM:
-                        carm_handle_generic(host, crq, is_ok,
+                        carm_handle_generic(host, crq, error,
                                             HST_ALLOC_BUF, HST_SYNC_TIME);
                         break;
                 case MISC_SET_TIME:
-                        carm_handle_generic(host, crq, is_ok,
+                        carm_handle_generic(host, crq, error,
                                             HST_SYNC_TIME, HST_GET_FW_VER);
                         break;
                 case MISC_GET_FW_VER: {
                         struct carm_fw_ver *ver = (struct carm_fw_ver *)
                                 mem + sizeof(struct carm_msg_get_fw_ver);
-                        if (is_ok) {
+                        if (!error) {
                                 host->fw_ver = le32_to_cpu(ver->version);
                                 host->flags |= (ver->features & FL_FW_VER_MASK);
                         }
-                        carm_handle_generic(host, crq, is_ok,
+                        carm_handle_generic(host, crq, error,
                                             HST_GET_FW_VER, HST_PORT_SCAN);
                         break;
                 }
@@ -1140,7 +1138,7 @@ static inline void carm_handle_resp(struct carm_host *host,
         case CARM_MSG_ARRAY: {
                 switch (crq->msg_subtype) {
                 case CARM_ARRAY_INFO:
-                        carm_handle_array_info(host, crq, mem, is_ok);
+                        carm_handle_array_info(host, crq, mem, error);
                         break;
                 default:
                         /* unknown / invalid response */
@@ -1159,7 +1157,7 @@ static inline void carm_handle_resp(struct carm_host *host,
 err_out:
         printk(KERN_WARNING DRV_NAME "(%s): BUG: unhandled message type %d/%d\n",
                pci_name(host->pdev), crq->msg_type, crq->msg_subtype);
-        carm_end_rq(host, crq, 0);
+        carm_end_rq(host, crq, -EIO);
 }
 
 static inline void carm_handle_responses(struct carm_host *host)
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 08e909dc7944..c6179d6ac6e4 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -808,16 +808,16 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 
 static void ub_end_rq(struct request *rq, unsigned int scsi_status)
 {
-        int uptodate;
+        int error;
 
         if (scsi_status == 0) {
-                uptodate = 1;
+                error = 0;
         } else {
-                uptodate = 0;
+                error = -EIO;
                 rq->errors = scsi_status;
         }
-        end_that_request_first(rq, uptodate, rq->hard_nr_sectors);
-        end_that_request_last(rq, uptodate);
+        if (__blk_end_request(rq, error, blk_rq_bytes(rq)))
+                BUG();
 }
 
 static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index ab5d404faa11..9e61fca46117 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -229,13 +229,10 @@ static struct block_device_operations viodasd_fops = {
 /*
  * End a request
  */
-static void viodasd_end_request(struct request *req, int uptodate,
+static void viodasd_end_request(struct request *req, int error,
                 int num_sectors)
 {
-        if (end_that_request_first(req, uptodate, num_sectors))
-                return;
-        add_disk_randomness(req->rq_disk);
-        end_that_request_last(req, uptodate);
+        __blk_end_request(req, error, num_sectors << 9);
 }
 
 /*
@@ -374,12 +371,12 @@ static void do_viodasd_request(struct request_queue *q)
                 blkdev_dequeue_request(req);
                 /* check that request contains a valid command */
                 if (!blk_fs_request(req)) {
-                        viodasd_end_request(req, 0, req->hard_nr_sectors);
+                        viodasd_end_request(req, -EIO, req->hard_nr_sectors);
                         continue;
                 }
                 /* Try sending the request */
                 if (send_request(req) != 0)
-                        viodasd_end_request(req, 0, req->hard_nr_sectors);
+                        viodasd_end_request(req, -EIO, req->hard_nr_sectors);
         }
 }
 
@@ -591,7 +588,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent)
         num_req_outstanding--;
         spin_unlock_irqrestore(&viodasd_spinlock, irq_flags);
 
-        error = event->xRc != HvLpEvent_Rc_Good;
+        error = (event->xRc == HvLpEvent_Rc_Good) ? 0 : -EIO;
         if (error) {
                 const struct vio_error_entry *err;
                 err = vio_lookup_rc(viodasd_err_table, bevent->sub_result);
@@ -601,7 +598,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent)
         }
         qlock = req->q->queue_lock;
         spin_lock_irqsave(qlock, irq_flags);
-        viodasd_end_request(req, !error, num_sect);
+        viodasd_end_request(req, error, num_sect);
         spin_unlock_irqrestore(qlock, irq_flags);
 
         /* Finally, try to get more requests off of this device's queue */
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2bdebcb3ff16..8afce67c0aa5 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -452,7 +452,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
         RING_IDX i, rp;
         unsigned long flags;
         struct blkfront_info *info = (struct blkfront_info *)dev_id;
-        int uptodate;
+        int error;
 
         spin_lock_irqsave(&blkif_io_lock, flags);
 
@@ -477,13 +477,13 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
 
                 add_id_to_freelist(info, id);
 
-                uptodate = (bret->status == BLKIF_RSP_OKAY);
+                error = (bret->status == BLKIF_RSP_OKAY) ? 0 : -EIO;
                 switch (bret->operation) {
                 case BLKIF_OP_WRITE_BARRIER:
                         if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) {
                                 printk(KERN_WARNING "blkfront: %s: write barrier op failed\n",
                                        info->gd->disk_name);
-                                uptodate = -EOPNOTSUPP;
+                                error = -EOPNOTSUPP;
                                 info->feature_barrier = 0;
                                 xlvbd_barrier(info);
                         }
@@ -494,10 +494,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
                                 dev_dbg(&info->xbdev->dev, "Bad return from blkdev data "
                                         "request: %x\n", bret->status);
 
-                        ret = end_that_request_first(req, uptodate,
-                                req->hard_nr_sectors);
+                        ret = __blk_end_request(req, error, blk_rq_bytes(req));
                         BUG_ON(ret);
-                        end_that_request_last(req, uptodate);
                         break;
                 default:
                         BUG();
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 82effce97c51..2c81465fd60c 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -703,7 +703,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
 
                 /* bio finished; is there another one? */
                 i = ace->req->current_nr_sectors;
-                if (end_that_request_first(ace->req, 1, i)) {
+                if (__blk_end_request(ace->req, 0, i)) {
                         /* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
                          *      ace->req->hard_nr_sectors,
                          *      ace->req->current_nr_sectors);
@@ -718,9 +718,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
                 break;
 
         case ACE_FSM_STATE_REQ_COMPLETE:
-                /* Complete the block request */
-                blkdev_dequeue_request(ace->req);
-                end_that_request_last(ace->req, 1);
                 ace->req = NULL;
 
                 /* Finished request; go to idle state */