git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: wacom - merge out and in prox events
[safe/jmp/linux-2.6]
/
block
/
noop-iosched.c
diff --git
a/block/noop-iosched.c
b/block/noop-iosched.c
index
f370e4a
..
232c4b3
100644
(file)
--- a/
block/noop-iosched.c
+++ b/
block/noop-iosched.c
@@
-5,19
+5,20
@@
#include <linux/elevator.h>
#include <linux/bio.h>
#include <linux/module.h>
#include <linux/elevator.h>
#include <linux/bio.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/init.h>
struct noop_data {
struct list_head queue;
};
#include <linux/init.h>
struct noop_data {
struct list_head queue;
};
-static void noop_merged_requests(
request_queue_t
*q, struct request *rq,
+static void noop_merged_requests(
struct request_queue
*q, struct request *rq,
struct request *next)
{
list_del_init(&next->queuelist);
}
struct request *next)
{
list_del_init(&next->queuelist);
}
-static int noop_dispatch(
request_queue_t
*q, int force)
+static int noop_dispatch(
struct request_queue
*q, int force)
{
struct noop_data *nd = q->elevator->elevator_data;
{
struct noop_data *nd = q->elevator->elevator_data;
@@
-31,14
+32,14
@@
static int noop_dispatch(request_queue_t *q, int force)
return 0;
}
return 0;
}
-static void noop_add_request(
request_queue_t
*q, struct request *rq)
+static void noop_add_request(
struct request_queue
*q, struct request *rq)
{
struct noop_data *nd = q->elevator->elevator_data;
list_add_tail(&rq->queuelist, &nd->queue);
}
{
struct noop_data *nd = q->elevator->elevator_data;
list_add_tail(&rq->queuelist, &nd->queue);
}
-static int noop_queue_empty(
request_queue_t
*q)
+static int noop_queue_empty(
struct request_queue
*q)
{
struct noop_data *nd = q->elevator->elevator_data;
{
struct noop_data *nd = q->elevator->elevator_data;
@@
-46,7
+47,7
@@
static int noop_queue_empty(request_queue_t *q)
}
static struct request *
}
static struct request *
-noop_former_request(
request_queue_t
*q, struct request *rq)
+noop_former_request(
struct request_queue
*q, struct request *rq)
{
struct noop_data *nd = q->elevator->elevator_data;
{
struct noop_data *nd = q->elevator->elevator_data;
@@
-56,7
+57,7
@@
noop_former_request(request_queue_t *q, struct request *rq)
}
static struct request *
}
static struct request *
-noop_latter_request(
request_queue_t
*q, struct request *rq)
+noop_latter_request(
struct request_queue
*q, struct request *rq)
{
struct noop_data *nd = q->elevator->elevator_data;
{
struct noop_data *nd = q->elevator->elevator_data;
@@
-65,19
+66,18
@@
noop_latter_request(request_queue_t *q, struct request *rq)
return list_entry(rq->queuelist.next, struct request, queuelist);
}
return list_entry(rq->queuelist.next, struct request, queuelist);
}
-static
int noop_init_queue(request_queue_t *q, elevator_t *e
)
+static
void *noop_init_queue(struct request_queue *q
)
{
struct noop_data *nd;
{
struct noop_data *nd;
- nd = kmalloc
(sizeof(*nd), GFP_KERNEL
);
+ nd = kmalloc
_node(sizeof(*nd), GFP_KERNEL, q->node
);
if (!nd)
if (!nd)
- return
-ENOMEM
;
+ return
NULL
;
INIT_LIST_HEAD(&nd->queue);
INIT_LIST_HEAD(&nd->queue);
- e->elevator_data = nd;
- return 0;
+ return nd;
}
}
-static void noop_exit_queue(
elevator_t
*e)
+static void noop_exit_queue(
struct elevator_queue
*e)
{
struct noop_data *nd = e->elevator_data;
{
struct noop_data *nd = e->elevator_data;
@@
-102,7
+102,9
@@
static struct elevator_type elevator_noop = {
static int __init noop_init(void)
{
static int __init noop_init(void)
{
- return elv_register(&elevator_noop);
+ elv_register(&elevator_noop);
+
+ return 0;
}
static void __exit noop_exit(void)
}
static void __exit noop_exit(void)