1 files changed, 7 insertions, 2 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 6f2751d305de..b9abdca84c17 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3656,12 +3656,17 @@ static struct cfq_queue *
 cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic,
               struct bio *bio, gfp_t gfp_mask)
 {
-        const int ioprio_class = IOPRIO_PRIO_CLASS(cic->ioprio);
-        const int ioprio = IOPRIO_PRIO_DATA(cic->ioprio);
+        int ioprio_class = IOPRIO_PRIO_CLASS(cic->ioprio);
+        int ioprio = IOPRIO_PRIO_DATA(cic->ioprio);
         struct cfq_queue **async_cfqq = NULL;
         struct cfq_queue *cfqq = NULL;
 
         if (!is_sync) {
+                if (!ioprio_valid(cic->ioprio)) {
+                        struct task_struct *tsk = current;
+                        ioprio = task_nice_ioprio(tsk);
+                        ioprio_class = task_nice_ioclass(tsk);
+                }
                 async_cfqq = cfq_async_queue_prio(cfqd, ioprio_class, ioprio);
                 cfqq = *async_cfqq;
         }