Commit baa0ab2b authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.15-2021-10-14' of git://git.infradead.org/nvme into block-5.15 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.15:

 - fix the abort command id (Keith Busch)
 - nvme: fix per-namespace chardev deletion (Adam Manzanares)"

* tag 'nvme-5.15-2021-10-14' of git://git.infradead.org/nvme:
  nvme: fix per-namespace chardev deletion
  nvme-pci: Fix abort command id
parents 7904022d be5eb933

drivers/nvme/host/core.c

+12 −9
Original line number Diff line number Diff line
@@ -3550,10 +3550,15 @@ static int __nvme_check_ids(struct nvme_subsystem *subsys, 
	return 0;

}



static void nvme_cdev_rel(struct device *dev)

{

	ida_simple_remove(&nvme_ns_chr_minor_ida, MINOR(dev->devt));

}



void nvme_cdev_del(struct cdev *cdev, struct device *cdev_device)

{

	cdev_device_del(cdev, cdev_device);

	ida_simple_remove(&nvme_ns_chr_minor_ida, MINOR(cdev_device->devt));

	put_device(cdev_device);

}



int nvme_cdev_add(struct cdev *cdev, struct device *cdev_device,
@@ -3566,14 +3571,14 @@ int nvme_cdev_add(struct cdev *cdev, struct device *cdev_device, 
		return minor;

	cdev_device->devt = MKDEV(MAJOR(nvme_ns_chr_devt), minor);

	cdev_device->class = nvme_ns_chr_class;

	cdev_device->release = nvme_cdev_rel;

	device_initialize(cdev_device);

	cdev_init(cdev, fops);

	cdev->owner = owner;

	ret = cdev_device_add(cdev, cdev_device);

	if (ret) {

	if (ret)

		put_device(cdev_device);

		ida_simple_remove(&nvme_ns_chr_minor_ida, minor);

	}



	return ret;

}
@@ -3605,11 +3610,9 @@ static int nvme_add_ns_cdev(struct nvme_ns *ns) 
			   ns->ctrl->instance, ns->head->instance);

	if (ret)

		return ret;

	ret = nvme_cdev_add(&ns->cdev, &ns->cdev_device, &nvme_ns_chr_fops,



	return nvme_cdev_add(&ns->cdev, &ns->cdev_device, &nvme_ns_chr_fops,

			     ns->ctrl->ops->module);

	if (ret)

		kfree_const(ns->cdev_device.kobj.name);

	return ret;

}



static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,

drivers/nvme/host/multipath.c

+0 −2
Original line number Diff line number Diff line
@@ -431,8 +431,6 @@ static int nvme_add_ns_head_cdev(struct nvme_ns_head *head) 
		return ret;

	ret = nvme_cdev_add(&head->cdev, &head->cdev_device,

			    &nvme_ns_head_chr_fops, THIS_MODULE);

	if (ret)

		kfree_const(head->cdev_device.kobj.name);

	return ret;

}

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	iod->aborted = 1;



	cmd.abort.opcode = nvme_admin_abort_cmd;

	cmd.abort.cid = req->tag;

	cmd.abort.cid = nvme_cid(req);

	cmd.abort.sqid = cpu_to_le16(nvmeq->qid);



	dev_warn(nvmeq->dev->ctrl.device,