git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
block
/
ckrm-io.c
diff --git
a/drivers/block/ckrm-io.c
b/drivers/block/ckrm-io.c
index
7edfce7
..
960407e
100644
(file)
--- a/
drivers/block/ckrm-io.c
+++ b/
drivers/block/ckrm-io.c
@@
-93,10
+93,6
@@
static inline int cki_div(int *a, int b, int c);
//static inline int cki_recalc(cki_icls_t *icls, int rel2abs);
static void cki_recalc_propagate(cki_icls_t *res, cki_icls_t *parres);
//static inline int cki_recalc(cki_icls_t *icls, int rel2abs);
static void cki_recalc_propagate(cki_icls_t *res, cki_icls_t *parres);
-/* External functions e.g. interface to ioscheduler */
-void *cki_tsk_icls (struct task_struct *tsk);
-int cki_tsk_ioprio (struct task_struct *tsk);
-
extern void cki_cfq_set(icls_tsk_t tskicls, icls_ioprio_t tskioprio);
/* CKRM Resource Controller API functions */
extern void cki_cfq_set(icls_tsk_t tskicls, icls_ioprio_t tskioprio);
/* CKRM Resource Controller API functions */
@@
-523,7
+519,7
@@
static void cki_chgcls(void *tsk, void *oldres, void *newres)
struct ckrm_res_ctlr cki_rcbs = {
struct ckrm_res_ctlr cki_rcbs = {
- .res_name = "
io
",
+ .res_name = "
cki
",
.res_hdepth = 1,
.resid = -1,
.res_alloc = cki_alloc,
.res_hdepth = 1,
.resid = -1,
.res_alloc = cki_alloc,