diff options
| author | Martijn Coenen <maco@android.com> | 2020-03-10 14:06:54 +0100 |
|---|---|---|
| committer | Martijn Coenen <maco@android.com> | 2020-04-04 14:13:43 +0200 |
| commit | b38f4f7e2083135923325397a4fafe3130d0ca8b (patch) | |
| tree | 06efa7e54be9e1f588382623e6e82b5159b381ba | |
| parent | 9ddfc61021e5976b83fd0fa047df0ec3b183950f (diff) | |
UPSTREAM: loop: Only freeze block queue when needed.ASB-2020-04-05_4.19-q
__loop_update_dio() can be called as a part of loop_set_fd(), when the
block queue is not yet up and running; avoid freezing the block queue in
that case, since that is an expensive operation.
Bug: 148607611
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Martijn Coenen <maco@android.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit 0fbcf57982346763ec636f176d5afaa367b5f71b)
Change-Id: I17d8de6b6b54a667703d60ea1c62449bb14331da
| -rw-r--r-- | drivers/block/loop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 6fc5d7eada09..feb97e7bdbad 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -213,7 +213,8 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) * LO_FLAGS_READ_ONLY, both are set from kernel, and losetup * will get updated by ioctl(LOOP_GET_STATUS) */ - blk_mq_freeze_queue(lo->lo_queue); + if (lo->lo_state == Lo_bound) + blk_mq_freeze_queue(lo->lo_queue); lo->use_dio = use_dio; if (use_dio) { blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue); @@ -222,7 +223,8 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue); lo->lo_flags &= ~LO_FLAGS_DIRECT_IO; } - blk_mq_unfreeze_queue(lo->lo_queue); + if (lo->lo_state == Lo_bound) + blk_mq_unfreeze_queue(lo->lo_queue); } static int |