Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr...

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

diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 76dad48..beb9ce1 100644 (file)
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -42,26 +42,14 @@ enum {
 };
 
 /*
- * if process has set io priority explicitly, use that. if not, convert
- * the cpu scheduler nice value to an io priority
+ * Fallback BE priority
  */
 #define IOPRIO_NORM    (4)
-static inline int task_ioprio(struct io_context *ioc)
-{
-       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;
-}
 
+/*
+ * if process has set io priority explicitly, use that. if not, convert
+ * the cpu scheduler nice value to an io priority
+ */
 static inline int task_nice_ioprio(struct task_struct *task)
 {
        return (task_nice(task) + 20) / 5;