diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-12-08 14:12:24 +0100 |
|---|---|---|
| committer | Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-12-08 14:12:24 +0100 |
| commit | 1dfd4ab138fc9f9cad869e6110022c7cfd5544d1 (patch) | |
| tree | 126a2637bb2aab8918aa025ffecac54107e20936 | |
| parent | 21e7e3cca0c5a1ef7b3e5a9c85df05c92f23596f (diff) | |
| download | ldd3-1dfd4ab138fc9f9cad869e6110022c7cfd5544d1.tar.gz | |
sbull: Change according to the new block layer request queue API (http://lwn.net/Articles/333620/)
| -rw-r--r-- | sbull/sbull.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbull/sbull.c b/sbull/sbull.c index fffcc5c..a8914e2 100644 --- a/sbull/sbull.c +++ b/sbull/sbull.c @@ -104,7 +104,7 @@ static void sbull_request(struct request_queue *q) { struct request *req; - while ((req = elv_next_request(q)) != NULL) { + while ((req = blk_peek_request(q)) != NULL) { struct sbull_dev *dev = req->rq_disk->private_data; if (! blk_fs_request(req)) { printk (KERN_NOTICE "Skip non-fs request\n"); @@ -168,7 +168,7 @@ static void sbull_full_request(struct request_queue *q) int sectors_xferred; struct sbull_dev *dev = q->queuedata; - while ((req = elv_next_request(q)) != NULL) { + while ((req = blk_peek_request(q)) != NULL) { if (! blk_fs_request(req)) { printk (KERN_NOTICE "Skip non-fs request\n"); end_request(req, 0); @@ -176,7 +176,7 @@ static void sbull_full_request(struct request_queue *q) } sectors_xferred = sbull_xfer_request(dev, req); if (! end_that_request_first(req, 1, sectors_xferred)) { - blkdev_dequeue_request(req); + blk_start_request(req); end_that_request_last(req); } } |