block: replace end_request() with [__]blk_end_request_cur()

[linux-2.6-block.git] / drivers / block / mg_disk.c

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index f3898353d0a8f9dc6d328ace0e06689ae366c214..408c2bd8a439b321c7fd54d27268b9c027140464 100644 (file)
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -285,7 +285,7 @@ static void mg_bad_rw_intr(struct mg_host *host)
        if (req != NULL)
                if (++req->errors >= MG_MAX_ERRORS ||
                                host->error == MG_ERR_TIMEOUT)
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
 }
 
 static unsigned int mg_out(struct mg_host *host,
@@ -351,7 +351,7 @@ static void mg_read(struct request *req)
 
                if (req->current_nr_sectors <= 0) {
                        MG_DBG("remain : %d sects\n", remains);
-                       end_request(req, 1);
+                       __blk_end_request_cur(req, 0);
                        if (remains > 0)
                                req = elv_next_request(host->breq);
                }
@@ -395,7 +395,7 @@ static void mg_write(struct request *req)
 
                if (req->current_nr_sectors <= 0) {
                        MG_DBG("remain : %d sects\n", remains);
-                       end_request(req, 1);
+                       __blk_end_request_cur(req, 0);
                        if (remains > 0)
                                req = elv_next_request(host->breq);
                }
@@ -448,7 +448,7 @@ ok_to_read:
 
        /* let know if current segment done */
        if (req->current_nr_sectors <= 0)
-               end_request(req, 1);
+               __blk_end_request_cur(req, 0);
 
        /* set handler if read remains */
        if (i > 0) {
@@ -497,7 +497,7 @@ ok_to_write:
 
        /* let know if current segment or all done */
        if (!i || (req->bio && req->current_nr_sectors <= 0))
-               end_request(req, 1);
+               __blk_end_request_cur(req, 0);
 
        /* write 1 sector and set handler if remains */
        if (i > 0) {
@@ -563,7 +563,7 @@ static void mg_request_poll(struct request_queue *q)
                        default:
                                printk(KERN_WARNING "%s:%d unknown command\n",
                                                __func__, __LINE__);
-                               end_request(req, 0);
+                               __blk_end_request_cur(req, -EIO);
                                break;
                        }
                }
@@ -617,7 +617,7 @@ static unsigned int mg_issue_req(struct request *req,
        default:
                printk(KERN_WARNING "%s:%d unknown command\n",
                                __func__, __LINE__);
-               end_request(req, 0);
+               __blk_end_request_cur(req, -EIO);
                break;
        }
        return MG_ERR_NONE;
@@ -655,7 +655,7 @@ static void mg_request(struct request_queue *q)
                                        "%s: bad access: sector=%d, count=%d\n",
                                        req->rq_disk->disk_name,
                                        sect_num, sect_cnt);
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                        continue;
                }