projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
include
/
linux
/
ioprio.h
diff --git
a/include/linux/ioprio.h
b/include/linux/ioprio.h
index
baf2938
..
2a3bb1b
100644
(file)
--- a/
include/linux/ioprio.h
+++ b/
include/linux/ioprio.h
@@
-2,6
+2,7
@@
#define IOPRIO_H
#include <linux/sched.h>
#define IOPRIO_H
#include <linux/sched.h>
+#include <linux/iocontext.h>
/*
* Gives us 8 prio classes with 13-bits of data for each class
/*
* Gives us 8 prio classes with 13-bits of data for each class
@@
-45,18
+46,18
@@
enum {
* the cpu scheduler nice value to an io priority
*/
#define IOPRIO_NORM (4)
* the cpu scheduler nice value to an io priority
*/
#define IOPRIO_NORM (4)
-static inline int task_ioprio(struct
task_struct *task
)
+static inline int task_ioprio(struct
io_context *ioc
)
{
{
- if (ioprio_valid(
task
->ioprio))
- return IOPRIO_PRIO_DATA(
task
->ioprio);
+ if (ioprio_valid(
ioc
->ioprio))
+ return IOPRIO_PRIO_DATA(
ioc
->ioprio);
return IOPRIO_NORM;
}
return IOPRIO_NORM;
}
-static inline int task_ioprio_class(struct
task_struct *task
)
+static inline int task_ioprio_class(struct
io_context *ioc
)
{
{
- if (ioprio_valid(
task
->ioprio))
- return IOPRIO_PRIO_CLASS(
task
->ioprio);
+ if (ioprio_valid(
ioc
->ioprio))
+ return IOPRIO_PRIO_CLASS(
ioc
->ioprio);
return IOPRIO_CLASS_BE;
}
return IOPRIO_CLASS_BE;
}