Merge android-4.4-p.204 (583bdda) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f002d2c..44904c3 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2949,9 +2949,7 @@ static void __dm_destroy(struct mapped_device *md, bool wait)
        set_bit(DMF_FREEING, &md->flags);
        spin_unlock(&_minor_lock);
 
-       spin_lock_irq(q->queue_lock);
-       queue_flag_set(QUEUE_FLAG_DYING, q);
-       spin_unlock_irq(q->queue_lock);
+       blk_set_queue_dying(q);
 
        if (dm_request_based(md) && md->kworker_task)
                flush_kthread_worker(&md->kworker);