From 75e68ef8c371a4858a1a65a24f63177bde60e40e Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Tue, 11 Dec 2007 17:46:47 -0500 Subject: [PATCH] --- yaml --- r: 77633 b: refs/heads/master c: 7d699bafe258ebd8f9b4ec182c554200b369a504 h: refs/heads/master i: 77631: 8d3c7ac3e8b79e634978aaa00d36eeac41652e11 v: v3 --- [refs] | 2 +- trunk/drivers/block/ub.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8b59c2d475f7..6ba8b6bbe801 100644 --- 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 index 08e909dc7944..c6179d6ac6e4 100644 --- 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,