From 3faa7a609f418c6c84a83030ff4ce79cce1db4c9 Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Tue, 11 Dec 2007 17:44:06 -0500 Subject: [PATCH] --- yaml --- r: 77612 b: refs/heads/master c: 097c94a4e8bde978c8d12683d9a34048e9139e4b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/nbd.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fba721939e63..38058b1d9b23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c5093ba036b5e1a4befdcd6036d241178a720a8 +refs/heads/master: 097c94a4e8bde978c8d12683d9a34048e9139e4b diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index ba9b17e507e0..ae3106045ee5 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/drivers/block/nbd.c @@ -100,17 +100,15 @@ static const char *nbdcmd_to_ascii(int cmd) static void nbd_end_request(struct request *req) { - int uptodate = (req->errors == 0) ? 1 : 0; + int error = req->errors ? -EIO : 0; struct request_queue *q = req->q; unsigned long flags; dprintk(DBG_BLKDEV, "%s: request %p: %s\n", req->rq_disk->disk_name, - req, uptodate? "done": "failed"); + req, error ? "failed" : "done"); spin_lock_irqsave(q->queue_lock, flags); - if (!end_that_request_first(req, uptodate, req->nr_sectors)) { - end_that_request_last(req, uptodate); - } + __blk_end_request(req, error, req->nr_sectors << 9); spin_unlock_irqrestore(q->queue_lock, flags); }