From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jun 2021 19:12:56 +0000 (-0700)
Subject: Merge tag 'for-5.14/block-2021-06-29' of git://git.kernel.dk/linux-block
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=df668a5fe461bb9d7e899c538acc7197746038f4;p=kernel.git

Merge tag 'for-5.14/block-2021-06-29' of git://git.kernel.dk/linux-block

Pull core block updates from Jens Axboe:

 - disk events cleanup (Christoph)

 - gendisk and request queue allocation simplifications (Christoph)

 - bdev_disk_changed cleanups (Christoph)

 - IO priority improvements (Bart)

 - Chained bio completion trace fix (Edward)

 - blk-wbt fixes (Jan)

 - blk-wbt enable/disable fix (Zhang)

 - Scheduler dispatch improvements (Jan, Ming)

 - Shared tagset scheduler improvements (John)

 - BFQ updates (Paolo, Luca, Pietro)

 - BFQ lock inversion fix (Jan)

 - Documentation improvements (Kir)

 - CLONE_IO block cgroup fix (Tejun)

 - Remove of ancient and deprecated block dump feature (zhangyi)

 - Discard merge fix (Ming)

 - Misc fixes or followup fixes (Colin, Damien, Dan, Long, Max, Thomas,
   Yang)

* tag 'for-5.14/block-2021-06-29' of git://git.kernel.dk/linux-block: (129 commits)
  block: fix discard request merge
  block/mq-deadline: Remove a WARN_ON_ONCE() call
  blk-mq: update hctx->dispatch_busy in case of real scheduler
  blk: Fix lock inversion between ioc lock and bfqd lock
  bfq: Remove merged request already in bfq_requests_merged()
  block: pass a gendisk to bdev_disk_changed
  block: move bdev_disk_changed
  block: add the events* attributes to disk_attrs
  block: move the disk events code to a separate file
  block: fix trace completion for chained bio
  block/partitions/msdos: Fix typo inidicator -> indicator
  block, bfq: reset waker pointer with shared queues
  block, bfq: check waker only for queues with no in-flight I/O
  block, bfq: avoid delayed merge of async queues
  block, bfq: boost throughput by extending queue-merging times
  block, bfq: consider also creation time in delayed stable merge
  block, bfq: fix delayed stable merge check
  block, bfq: let also stably merged queues enjoy weight raising
  blk-wbt: make sure throttle is enabled properly
  blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
  ...
---

df668a5fe461bb9d7e899c538acc7197746038f4
diff --cc drivers/block/loop.c
index 452c7437e1f00,4fb1f9530d5a5..36e4312f6381f
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -2322,9 -2158,9 +2316,10 @@@ static int loop_add(struct loop_device 
  	mutex_init(&lo->lo_mutex);
  	lo->lo_number		= i;
  	spin_lock_init(&lo->lo_lock);
 +	spin_lock_init(&lo->lo_work_lock);
  	disk->major		= LOOP_MAJOR;
  	disk->first_minor	= i << part_shift;
+ 	disk->minors		= 1 << part_shift;
  	disk->fops		= &lo_fops;
  	disk->private_data	= lo;
  	disk->queue		= lo->lo_queue;