git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
block
/
noop-iosched.c
diff --git
a/block/noop-iosched.c
b/block/noop-iosched.c
index
f370e4a
..
79af431
100644
(file)
--- a/
block/noop-iosched.c
+++ b/
block/noop-iosched.c
@@
-65,16
+65,15
@@
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(request_queue_t *q, elevator_t *e)
{
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(elevator_t *e)