Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 097c94a4 authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by Jens Axboe
Browse files

blk_end_request: changing nbd (take 4) 



This patch converts nbd to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

Cc: Paul Clements <Paul.Clements@steeleye.com>
Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 1c5093ba

drivers/block/nbd.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

}