---

yaml --- r: 77633 b: refs/heads/master c: 7d699ba h: refs/heads/master i: 77631: 8d3c7ac v: v3
git-mirror · Jan 28, 2008 · 75e68ef · 75e68ef
1 parent 6e55a24
commit 75e68ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8286239ddaf2632cec65c01e68a403ac4c3d079
+refs/heads/master: 7d699bafe258ebd8f9b4ec182c554200b369a504
diff --git a/trunk/drivers/block/ub.c b/trunk/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,