From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Tue, 11 Dec 2007 22:46:47 +0000 (-0500)
Subject: blk_end_request: changing ub (take 4)
X-Git-Tag: v2.6.25-rc1~1172^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7d699bafe258ebd8f9b4ec182c554200b369a504;p=linux-2.6-omap-h63xx.git

blk_end_request: changing ub (take 4)

This patch converts ub to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 08e909dc794..c6179d6ac6e 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,