blk_end_request: changing ub (take 4)
authorKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Tue, 11 Dec 2007 22:46:47 +0000 (17:46 -0500)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 28 Jan 2008 09:37:17 +0000 (10:37 +0100)
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>
drivers/block/ub.c

index 08e909dc7944f9b85ec98d2db49e9f275859b6ae..c6179d6ac6e430764b5c22e67f2b4130191ef599 100644 (file)
@@ -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,