From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jun 2021 19:21:16 +0000 (-0700)
Subject: Merge tag 'for-5.14/drivers-2021-06-29' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=440462198d9c45e48f2d8d9b18c5702d92282f46;p=linux.git

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

Pull block driver updates from Jens Axboe:
 "Pretty calm round, mostly just NVMe and a bit of MD:

   - NVMe updates (via Christoph)
        - improve the APST configuration algorithm (Alexey Bogoslavsky)
        - look for StorageD3Enable on companion ACPI device
          (Mario Limonciello)
        - allow selecting the network interface for TCP connections
          (Martin Belanger)
        - misc cleanups (Amit Engel, Chaitanya Kulkarni, Colin Ian King,
          Christoph)
        - move the ACPI StorageD3 code to drivers/acpi/ and add quirks
          for certain AMD CPUs (Mario Limonciello)
        - zoned device support for nvmet (Chaitanya Kulkarni)
        - fix the rules for changing the serial number in nvmet
          (Noam Gottlieb)
        - various small fixes and cleanups (Dan Carpenter, JK Kim,
          Chaitanya Kulkarni, Hannes Reinecke, Wesley Sheng, Geert
          Uytterhoeven, Daniel Wagner)

   - MD updates (Via Song)
        - iostats rewrite (Guoqing Jiang)
        - raid5 lock contention optimization (Gal Ofri)

   - Fall through warning fix (Gustavo)

   - Misc fixes (Gustavo, Jiapeng)"

* tag 'for-5.14/drivers-2021-06-29' of git://git.kernel.dk/linux-block: (78 commits)
  nvmet: use NVMET_MAX_NAMESPACES to set nn value
  loop: Fix missing discard support when using LOOP_CONFIGURE
  nvme.h: add missing nvme_lba_range_type endianness annotations
  nvme: remove zeroout memset call for struct
  nvme-pci: remove zeroout memset call for struct
  nvmet: remove zeroout memset call for struct
  nvmet: add ZBD over ZNS backend support
  nvmet: add Command Set Identifier support
  nvmet: add nvmet_req_bio put helper for backends
  nvmet: add req cns error complete helper
  block: export blk_next_bio()
  nvmet: remove local variable
  nvmet: use nvme status value directly
  nvmet: use u32 type for the local variable nsid
  nvmet: use u32 for nvmet_subsys max_nsid
  nvmet: use req->cmd directly in file-ns fast path
  nvmet: use req->cmd directly in bdev-ns fast path
  nvmet: make ver stable once connection established
  nvmet: allow mn change if subsys not discovered
  nvmet: make sn stable once connection was established
  ...
---

440462198d9c45e48f2d8d9b18c5702d92282f46
diff --cc drivers/md/md.c
index d806be8cc2107,2c69905dd5c0a..ae8fe54ea3581
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@@ -5703,19 -5675,21 +5673,14 @@@ static int md_alloc(dev_t dev, char *na
  		 */
  		mddev->hold_active = UNTIL_STOP;
  
- 	error = mempool_init_kmalloc_pool(&mddev->md_io_pool, BIO_POOL_SIZE,
- 					  sizeof(struct md_io));
- 	if (error)
- 		goto abort;
- 
  	error = -ENOMEM;
 -	mddev->queue = blk_alloc_queue(NUMA_NO_NODE);
 -	if (!mddev->queue)
 +	disk = blk_alloc_disk(NUMA_NO_NODE);
 +	if (!disk)
  		goto abort;
  
 -	blk_set_stacking_limits(&mddev->queue->limits);
 -
 -	disk = alloc_disk(1 << shift);
 -	if (!disk) {
 -		blk_cleanup_queue(mddev->queue);
 -		mddev->queue = NULL;
 -		goto abort;
 -	}
  	disk->major = MAJOR(mddev->unit);
  	disk->first_minor = unit << shift;
 +	disk->minors = 1 << shift;
  	if (name)
  		strcpy(disk->disk_name, name);
  	else if (partitioned)
diff --cc drivers/nvme/host/fc.c
index f183f9fa03d0e,8a3c4814d21b7..7600863f7752b
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@@ -3112,10 -3111,9 +3112,10 @@@ nvme_fc_create_association(struct nvme_
  	}
  
  	/* FC-NVME supports normal SGL Data Block Descriptors */
- 	if (!(ctrl->ctrl.sgls & ((1 << 0) | (1 << 1)))) {
+ 	if (!nvme_ctrl_sgl_supported(&ctrl->ctrl)) {
  		dev_err(ctrl->ctrl.device,
  			"Mandatory sgls are not supported!\n");
 +		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
  		goto out_disconnect_admin_queue;
  	}