lkml.org 
[lkml]   [2009]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 14/18] jsflash: dequeue in-flight request
Date
jsflash processes requests one-by-one synchronously from a kthread and
can be easily converted to dequeueing model. Convert it.

[ Impact: dequeue in-flight request ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
---
drivers/sbus/char/jsflash.c | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index d56ddaa..f572a4a 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -186,31 +186,37 @@ static void jsfd_do_request(struct request_queue *q)
{
struct request *req;

- while ((req = elv_next_request(q)) != NULL) {
+ req = elv_next_request(q);
+ if (req)
+ blkdev_dequeue_request(req);
+
+ while (req) {
struct jsfd_part *jdp = req->rq_disk->private_data;
unsigned long offset = blk_rq_pos(req) << 9;
size_t len = blk_rq_cur_bytes(req);
+ int err = -EIO;

- if ((offset + len) > jdp->dsize) {
- __blk_end_request_cur(req, -EIO);
- continue;
- }
+ if ((offset + len) > jdp->dsize)
+ goto end;

if (rq_data_dir(req) != READ) {
printk(KERN_ERR "jsfd: write\n");
- __blk_end_request_cur(req, -EIO);
- continue;
+ goto end;
}

if ((jdp->dbase & 0xff000000) != 0x20000000) {
printk(KERN_ERR "jsfd: bad base %x\n", (int)jdp->dbase);
- __blk_end_request_cur(req, -EIO);
- continue;
+ goto end;
}

jsfd_read(req->buffer, jdp->dbase + offset, len);
-
- __blk_end_request_cur(req, 0);
+ err = 0;
+ end:
+ if (!__blk_end_request_cur(req, err)) {
+ req = elv_next_request(q);
+ if (req)
+ blkdev_dequeue_request(req);
+ }
}
}

--
1.6.0.2


\
 
 \ /
  Last update: 2009-05-08 05:05    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site