Slab allocators: consistent ZERO_SIZE_PTR support and NULL result semantics

[deliverable/linux.git] / include / linux / ioprio.h

diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 8e2042b9d471024635bb412b5ac1a1b0fe075108..2eaa142cd06171bae79f35a7e72442648cb86f46 100644 (file)
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -47,8 +47,10 @@ 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_nice_ioprio(struct task_struct *task)