[PATCH 08/30] blk_end_request: changing nbd (take 4)
DORMANTno replies
From: Kiyoshi Ueda <hidden>
Date: 2007-12-11 22:46:00
Also in:
dm-devel, linux-scsi, lkml
This patch converts nbd to use blk_end_request interfaces. Related 'uptodate' arguments are converted to 'error'. Cc: Paul Clements <redacted> Signed-off-by: Kiyoshi Ueda <redacted> Signed-off-by: Jun'ichi Nomura <redacted> --- drivers/block/nbd.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) Index: 2.6.24-rc4/drivers/block/nbd.c ===================================================================
--- 2.6.24-rc4.orig/drivers/block/nbd.c
+++ 2.6.24-rc4/drivers/block/nbd.c@@ -100,17 +100,15 @@ static const char *nbdcmd_to_ascii(int c 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); }