1 files changed, 3 insertions, 22 deletions

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