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

diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 8e2042b9d47..baf29387cab 100644
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -47,8 +47,18 @@ enum {
 #define IOPRIO_NORM	(4)
 static inline int task_ioprio(struct task_struct *task)
 {
-	WARN_ON(!ioprio_valid(task->ioprio));
-	return IOPRIO_PRIO_DATA(task->ioprio);
+	if (ioprio_valid(task->ioprio))
+		return IOPRIO_PRIO_DATA(task->ioprio);
+
+	return IOPRIO_NORM;
+}
+
+static inline int task_ioprio_class(struct task_struct *task)
+{
+	if (ioprio_valid(task->ioprio))
+		return IOPRIO_PRIO_CLASS(task->ioprio);
+
+	return IOPRIO_CLASS_BE;
 }
 
 static inline int task_nice_ioprio(struct task_struct *task)