projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-drm-fsl-dcu.git]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index 6cec3a1dccb8c4af57f3740357b90d7d55be7b49..84e9be073180253baab4cfddb69fbc2a4a14e764 100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-1464,8
+1464,7
@@
cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_io_context *cic)
}
static void
}
static void
-cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,
- struct request *rq)
+cfq_update_io_seektime(struct cfq_io_context *cic, struct request *rq)
{
sector_t sdist;
u64 total;
{
sector_t sdist;
u64 total;
@@
-1617,7
+1616,7
@@
cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
}
cfq_update_io_thinktime(cfqd, cic);
}
cfq_update_io_thinktime(cfqd, cic);
- cfq_update_io_seektime(c
fqd, c
ic, rq);
+ cfq_update_io_seektime(cic, rq);
cfq_update_idle_window(cfqd, cfqq, cic);
cic->last_queue = jiffies;
cfq_update_idle_window(cfqd, cfqq, cic);
cic->last_queue = jiffies;
@@
-1770,7
+1769,7
@@
static int cfq_may_queue(request_queue_t *q, int rw)
/*
* queue lock held here
*/
/*
* queue lock held here
*/
-static void cfq_put_request(
request_queue_t *q,
struct request *rq)
+static void cfq_put_request(struct request *rq)
{
struct cfq_queue *cfqq = RQ_CFQQ(rq);
{
struct cfq_queue *cfqq = RQ_CFQQ(rq);
@@
-1953,7
+1952,7
@@
static void cfq_exit_queue(elevator_t *e)
kfree(cfqd);
}
kfree(cfqd);
}
-static void *cfq_init_queue(request_queue_t *q
, elevator_t *e
)
+static void *cfq_init_queue(request_queue_t *q)
{
struct cfq_data *cfqd;
int i;
{
struct cfq_data *cfqd;
int i;