Merge tag 'for-5.8/drivers-2020-06-01' of git://git.kernel.dk/linux-block

[thirdparty/linux.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 8462ada86e912ad4ef6b4bd9bd81cff2e1070de2..4212288ab157cf439ce1ef36b3421ea4530f3a51 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -929,7 +929,7 @@ static void loop_unprepare_queue(struct loop_device *lo)
 
 static int loop_kthread_worker_fn(void *worker_ptr)
 {
-       current->flags |= PF_LESS_THROTTLE | PF_MEMALLOC_NOIO;
+       current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO;
        return kthread_worker_fn(worker_ptr);
 }
 
@@ -2106,7 +2106,7 @@ static int loop_add(struct loop_device **l, int i)
        lo->tag_set.queue_depth = 128;
        lo->tag_set.numa_node = NUMA_NO_NODE;
        lo->tag_set.cmd_size = sizeof(struct loop_cmd);
-       lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
+       lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_STACKING;
        lo->tag_set.driver_data = lo;
 
        err = blk_mq_alloc_tag_set(&lo->tag_set);