From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Aug 2021 01:52:11 +0000 (-0700)
Subject: Merge tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block
X-Git-Tag: howlett/maple/20220722_2~2481
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=679369114e55f422dc593d0628cfde1d04ae59b3;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block

Pull block updates from Jens Axboe:
 "Nothing major in here - lots of good cleanups and tech debt handling,
  which is also evident in the diffstats. In particular:

   - Add disk sequence numbers (Matteo)

   - Discard merge fix (Ming)

   - Relax disk zoned reporting restrictions (Niklas)

   - Bio error handling zoned leak fix (Pavel)

   - Start of proper add_disk() error handling (Luis, Christoph)

   - blk crypto fix (Eric)

   - Non-standard GPT location support (Dmitry)

   - IO priority improvements and cleanups (Damien)o

   - blk-throtl improvements (Chunguang)

   - diskstats_show() stack reduction (Abd-Alrhman)

   - Loop scheduler selection (Bart)

   - Switch block layer to use kmap_local_page() (Christoph)

   - Remove obsolete disk_name helper (Christoph)

   - block_device refcounting improvements (Christoph)

   - Ensure gendisk always has a request queue reference (Christoph)

   - Misc fixes/cleanups (Shaokun, Oliver, Guoqing)"

* tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block: (129 commits)
  sg: pass the device name to blk_trace_setup
  block, bfq: cleanup the repeated declaration
  blk-crypto: fix check for too-large dun_bytes
  blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
  blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
  block: mark blkdev_fsync static
  block: refine the disk_live check in del_gendisk
  mmc: sdhci-tegra: Enable MMC_CAP2_ALT_GPT_TEGRA
  mmc: block: Support alternative_gpt_sector() operation
  partitions/efi: Support non-standard GPT location
  block: Add alternative_gpt_sector() operation
  bio: fix page leak bio_add_hw_page failure
  block: remove CONFIG_DEBUG_BLOCK_EXT_DEVT
  block: remove a pointless call to MINOR() in device_add_disk
  null_blk: add error handling support for add_disk()
  virtio_blk: add error handling support for add_disk()
  block: add error handling for device_add_disk / add_disk
  block: return errors from disk_alloc_events
  block: return errors from blk_integrity_add
  block: call blk_register_queue earlier in device_add_disk
  ...
---

679369114e55f422dc593d0628cfde1d04ae59b3
diff --cc drivers/block/virtio_blk.c
index afb37aac09e8,63dc121a4c43..57c6ae7debd9
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -839,14 -820,6 +836,14 @@@ static int virtblk_probe(struct virtio_
  	else
  		blk_size = queue_logical_block_size(q);
  
 +	if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) {
 +		dev_err(&vdev->dev,
 +			"block size is changed unexpectedly, now is %u\n",
 +			blk_size);
 +		err = -EINVAL;
- 		goto err_cleanup_disk;
++		goto out_cleanup_disk;
 +	}
 +
  	/* Use topology information if available */
  	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_TOPOLOGY,
  				   struct virtio_blk_config, physical_block_exp,