On Mon, Aug 16, 2021 at 03:19:02PM +0200, Christoph Hellwig wrote:
> Switch to use the blk_mq_alloc_disk helper for allocating the
> request_queue and gendisk.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/nvme/host/core.c | 33 +++++++++++++--------------------
> 1 file changed, 13 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 1478d825011d..a5878ba14c55 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -3762,15 +3759,14 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
> 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_put_disk;
> + goto out_unlink_ns;
> }
> }
This hunk will fail because of the now removed NVME_QUIRK_LIGHTNVM. The
last part of the patch then can be removed to apply to linux-next.
Luis
