Merge remote-tracking branch 'block/for-next'

[karo-tx-linux.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 70819b7b021161a4a806ac1dd1c191544061d340..1c27b3eaef645ab1ff12d93ac400fcbdd3ebb655 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2299,10 +2299,8 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)
        int i;
 
        for (i = 0; i < set->nr_hw_queues; i++) {
-               if (set->tags[i]) {
+               if (set->tags[i])
                        blk_mq_free_rq_map(set, set->tags[i], i);
-                       free_cpumask_var(set->tags[i]->cpumask);
-               }
        }
 
        kfree(set->tags);