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 branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...
[pandora-kernel.git]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index
3be881e
..
ab7a9e6
100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-1014,10
+1014,9
@@
void cfq_update_blkio_group_weight(void *key, struct blkio_group *blkg,
cfqg->needs_update = true;
}
cfqg->needs_update = true;
}
-static struct cfq_group *
-
cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup
, int create)
+static struct cfq_group *
cfq_find_alloc_cfqg(struct cfq_data *cfqd,
+
struct blkio_cgroup *blkcg
, int create)
{
{
- struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgroup);
struct cfq_group *cfqg = NULL;
void *key = cfqd;
int i, j;
struct cfq_group *cfqg = NULL;
void *key = cfqd;
int i, j;
@@
-1079,12
+1078,12
@@
done:
*/
static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)
{
*/
static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)
{
- struct
cgroup *cgroup
;
+ struct
blkio_cgroup *blkcg
;
struct cfq_group *cfqg = NULL;
rcu_read_lock();
struct cfq_group *cfqg = NULL;
rcu_read_lock();
-
cgroup = task_cgroup(current, blkio_subsys_id
);
- cfqg = cfq_find_alloc_cfqg(cfqd,
cgroup
, create);
+
blkcg = task_blkio_cgroup(current
);
+ cfqg = cfq_find_alloc_cfqg(cfqd,
blkcg
, create);
if (!cfqg && create)
cfqg = &cfqd->root_group;
rcu_read_unlock();
if (!cfqg && create)
cfqg = &cfqd->root_group;
rcu_read_unlock();
@@
-2582,28
+2581,20
@@
static void cfq_put_queue(struct cfq_queue *cfqq)
}
/*
}
/*
- *
Must always be called with the rcu_read_lock() held
+ *
Call func for each cic attached to this ioc.
*/
static void
*/
static void
-
__
call_for_each_cic(struct io_context *ioc,
-
void (*func)(struct io_context *, struct cfq_io_context *))
+call_for_each_cic(struct io_context *ioc,
+ void (*func)(struct io_context *, struct cfq_io_context *))
{
struct cfq_io_context *cic;
struct hlist_node *n;
{
struct cfq_io_context *cic;
struct hlist_node *n;
+ rcu_read_lock();
+
hlist_for_each_entry_rcu(cic, n, &ioc->cic_list, cic_list)
func(ioc, cic);
hlist_for_each_entry_rcu(cic, n, &ioc->cic_list, cic_list)
func(ioc, cic);
-}
-/*
- * Call func for each cic attached to this ioc.
- */
-static void
-call_for_each_cic(struct io_context *ioc,
- void (*func)(struct io_context *, struct cfq_io_context *))
-{
- rcu_read_lock();
- __call_for_each_cic(ioc, func);
rcu_read_unlock();
}
rcu_read_unlock();
}
@@
-2664,7
+2655,7
@@
static void cfq_free_io_context(struct io_context *ioc)
* should be ok to iterate over the known list, we will see all cic's
* since no new ones are added.
*/
* should be ok to iterate over the known list, we will see all cic's
* since no new ones are added.
*/
-
__
call_for_each_cic(ioc, cic_free_func);
+ call_for_each_cic(ioc, cic_free_func);
}
static void cfq_put_cooperator(struct cfq_queue *cfqq)
}
static void cfq_put_cooperator(struct cfq_queue *cfqq)
@@
-3368,7
+3359,7
@@
cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
cfqd->busy_queues > 1) {
cfq_del_timer(cfqd, cfqq);
cfq_clear_cfqq_wait_request(cfqq);
cfqd->busy_queues > 1) {
cfq_del_timer(cfqd, cfqq);
cfq_clear_cfqq_wait_request(cfqq);
- __blk_run_queue(cfqd->queue
, false
);
+ __blk_run_queue(cfqd->queue);
} else {
cfq_blkiocg_update_idle_time_stats(
&cfqq->cfqg->blkg);
} else {
cfq_blkiocg_update_idle_time_stats(
&cfqq->cfqg->blkg);
@@
-3383,7
+3374,7
@@
cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
* this new queue is RT and the current one is BE
*/
cfq_preempt_queue(cfqd, cfqq);
* this new queue is RT and the current one is BE
*/
cfq_preempt_queue(cfqd, cfqq);
- __blk_run_queue(cfqd->queue
, false
);
+ __blk_run_queue(cfqd->queue);
}
}
}
}
@@
-3743,7
+3734,7
@@
static void cfq_kick_queue(struct work_struct *work)
struct request_queue *q = cfqd->queue;
spin_lock_irq(q->queue_lock);
struct request_queue *q = cfqd->queue;
spin_lock_irq(q->queue_lock);
- __blk_run_queue(cfqd->queue
, false
);
+ __blk_run_queue(cfqd->queue);
spin_unlock_irq(q->queue_lock);
}
spin_unlock_irq(q->queue_lock);
}