2007-09-11 18:58:52

by Kiyoshi Ueda

[permalink] [raw]
Subject: [PATCH 05/27] blk_end_request: changing um (take 2)

This patch converts um to use blk_end_request().

Signed-off-by: Kiyoshi Ueda <[email protected]>
Signed-off-by: Jun'ichi Nomura <[email protected]>
---
arch/um/drivers/ubd_kern.c | 10 +---------
1 files changed, 1 insertion(+), 9 deletions(-)

diff -rupN 04-arm-caller-change/arch/um/drivers/ubd_kern.c 05-um-caller-change/arch/um/drivers/ubd_kern.c
--- 04-arm-caller-change/arch/um/drivers/ubd_kern.c 2007-08-27 21:32:35.000000000 -0400
+++ 05-um-caller-change/arch/um/drivers/ubd_kern.c 2007-09-10 17:59:35.000000000 -0400
@@ -476,15 +476,7 @@ int thread_fd = -1;

static void ubd_end_request(struct request *req, int bytes, int uptodate)
{
- if (!end_that_request_first(req, uptodate, bytes >> 9)) {
- struct ubd *dev = req->rq_disk->private_data;
- unsigned long flags;
-
- add_disk_randomness(req->rq_disk);
- spin_lock_irqsave(&dev->lock, flags);
- end_that_request_last(req, uptodate);
- spin_unlock_irqrestore(&dev->lock, flags);
- }
+ blk_end_request(req, uptodate, bytes);
}

/* Callable only from interrupt context - otherwise you need to do