X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fioprio.h;h=2a3bb1bb74336f27c27f6627153900d46d6c178a;hb=47fe064831a2a949f6c1e0086f61a105e99ea867;hp=8e2042b9d471024635bb412b5ac1a1b0fe075108;hpb=8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 8e2042b9d47..2a3bb1bb743 100644
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -2,6 +2,7 @@
 #define IOPRIO_H
 
 #include <linux/sched.h>
+#include <linux/iocontext.h>
 
 /*
  * Gives us 8 prio classes with 13-bits of data for each class
@@ -45,10 +46,20 @@ enum {
  * 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)
 {
-	WARN_ON(!ioprio_valid(task->ioprio));
-	return IOPRIO_PRIO_DATA(task->ioprio);
+	if (ioprio_valid(ioc->ioprio))
+		return IOPRIO_PRIO_DATA(ioc->ioprio);
+
+	return IOPRIO_NORM;
+}
+
+static inline int task_ioprio_class(struct io_context *ioc)
+{
+	if (ioprio_valid(ioc->ioprio))
+		return IOPRIO_PRIO_CLASS(ioc->ioprio);
+
+	return IOPRIO_CLASS_BE;
 }
 
 static inline int task_nice_ioprio(struct task_struct *task)