1 files changed, 7 insertions, 6 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index c62bb2e650b8..e91093d0c0eb 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3731,8 +3731,8 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic,
 {
         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;
+        struct cfq_queue **async_cfqq;
+        struct cfq_queue *cfqq;
 
         if (!is_sync) {
                 if (!ioprio_valid(cic->ioprio)) {
@@ -3742,19 +3742,20 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic,
                 }
                 async_cfqq = cfq_async_queue_prio(cfqd, ioprio_class, ioprio);
                 cfqq = *async_cfqq;
+                if (cfqq)
+                        goto out;
         }
 
-        if (!cfqq)
-                cfqq = cfq_find_alloc_queue(cfqd, is_sync, cic, bio, gfp_mask);
+        cfqq = cfq_find_alloc_queue(cfqd, is_sync, cic, bio, gfp_mask);
 
         /*
          * pin the queue now that it's allocated, scheduler exit will prune it
          */
-        if (!is_sync && !(*async_cfqq)) {
+        if (!is_sync) {
                 cfqq->ref++;
                 *async_cfqq = cfqq;
         }
-
+out:
         cfqq->ref++;
         return cfqq;
 }