From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Aug 2021 02:01:46 +0000 (-0700)
Subject: Merge tag 'for-5.15/drivers-2021-08-30' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a1d6c9e3f53732f2f48f4424e028642db616663;p=uclinux-h8%2Flinux.git

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

Pull block driver updates from Jens Axboe:
 "Sitting on top of the core block changes, here are the driver changes
  for the 5.15 merge window:

   - NVMe updates via Christoph:
       - suspend improvements for devices with an HMB (Keith Busch)
       - handle double completions more gacefull (Sagi Grimberg)
       - cleanup the selects for the nvme core code a bit (Sagi Grimberg)
       - don't update queue count when failing to set io queues (Ruozhu Li)
       - various nvmet connect fixes (Amit Engel)
       - cleanup lightnvm leftovers (Keith Busch, me)
       - small cleanups (Colin Ian King, Hou Pu)
       - add tracing for the Set Features command (Hou Pu)
       - CMB sysfs cleanups (Keith Busch)
       - add a mutex_destroy call (Keith Busch)

   - remove lightnvm subsystem. It's served its purpose and ultimately
     led to zoned nvme support, we no longer need it (Christoph)

   - revert floppy O_NDELAY fix (Denis)

   - nbd fixes (Hou, Pavel, Baokun)

   - nbd locking fixes (Tetsuo)

   - nbd device removal fixes (Christoph)

   - raid10 rcu warning fix (Xiao)

   - raid1 write behind fix (Guoqing)

   - rnbd fixes (Gioh, Md Haris)

   - misc fixes (Colin)"

* tag 'for-5.15/drivers-2021-08-30' of git://git.kernel.dk/linux-block: (42 commits)
  Revert "floppy: reintroduce O_NDELAY fix"
  raid1: ensure write behind bio has less than BIO_MAX_VECS sectors
  md/raid10: Remove unnecessary rcu_dereference in raid10_handle_discard
  nbd: remove nbd->destroy_complete
  nbd: only return usable devices from nbd_find_unused
  nbd: set nbd->index before releasing nbd_index_mutex
  nbd: prevent IDR lookups from finding partially initialized devices
  nbd: reset NBD to NULL when restarting in nbd_genl_connect
  nbd: add missing locking to the nbd_dev_add error path
  nvme: remove the unused NVME_NS_* enum
  nvme: remove nvm_ndev from ns
  nvme: Have NVME_FABRICS select NVME_CORE instead of transport drivers
  block: nbd: add sanity check for first_minor
  nvmet: check that host sqsize does not exceed ctrl MQES
  nvmet: avoid duplicate qid in connect cmd
  nvmet: pass back cntlid on successful completion
  nvme-rdma: don't update queue count when failing to set io queues
  nvme-tcp: don't update queue count when failing to set io queues
  nvme-tcp: pair send_mutex init with destroy
  nvme: allow user toggling hmb usage
  ...
---

9a1d6c9e3f53732f2f48f4424e028642db616663
diff --cc drivers/nvme/host/core.c
index 68acd33c3856,b9a46c54f714..8679a108f571
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -3758,17 -3757,11 +3753,10 @@@ static void nvme_alloc_ns(struct nvme_c
  	if (!nvme_mpath_set_disk_name(ns, disk->disk_name, &disk->flags))
  		sprintf(disk->disk_name, "nvme%dn%d", ctrl->instance,
  			ns->head->instance);
 -	ns->disk = disk;
  
  	if (nvme_update_ns_info(ns, id))
 -		goto out_put_disk;
 +		goto out_unlink_ns;
  
- 	if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {
- 		if (nvme_nvm_register(ns, disk->disk_name, node)) {
- 			dev_warn(ctrl->device, "LightNVM init failure\n");
- 			goto out_unlink_ns;
- 		}
- 	}
- 
  	down_write(&ctrl->namespaces_rwsem);
  	list_add_tail(&ns->list, &ctrl->namespaces);
  	up_write(&ctrl->namespaces_rwsem);