ACK: [PATCH][SRU][J] nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned

[Tim Gardner]

Acked-by: Tim Gardner <tim.gardner at canonical.com>

On 2/14/22 3:30 AM, Koba Ko wrote:
> From: Luis Chamberlain <mcgrof at kernel.org>
> 
> BugLink: https://bugs.launchpad.net/bugs/1958850
> 
> Prior to devm being able to use pmem_release_disk() there are other
> failure which can occur for which we must account for and release the
> disk for. Address those few cases.
> 
> Fixes: 3dd60fb9d95d ("nvdimm/pmem: stop using q_usage_count as external pgmap refcount")
> Reviewed-by: Christoph Hellwig <hch at lst.de>
> Signed-off-by: Luis Chamberlain <mcgrof at kernel.org>
> Link: https://lore.kernel.org/r/20211103230437.1639990-6-mcgrof@kernel.org
> Signed-off-by: Jens Axboe <axboe at kernel.dk>
> (cherry picked from commit accf58afb689f81daadde24080ea1164ad2db75f)
> Signed-off-by: Koba Ko <koba.ko at canonical.com>
> ---
>   drivers/nvdimm/pmem.c | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
> index f576ee0ce7968..f8f1baf0d0625 100644
> --- a/drivers/nvdimm/pmem.c
> +++ b/drivers/nvdimm/pmem.c
> @@ -430,8 +430,10 @@ static int pmem_attach_disk(struct device *dev,
>   		bb_range.end = res->end;
>   	}
>   
> -	if (IS_ERR(addr))
> -		return PTR_ERR(addr);
> +	if (IS_ERR(addr)) {
> +		rc = PTR_ERR(addr);
> +		goto out;
> +	}
>   	pmem->virt_addr = addr;
>   
>   	blk_queue_write_cache(q, true, fua);
> @@ -456,7 +458,8 @@ static int pmem_attach_disk(struct device *dev,
>   		flags = DAXDEV_F_SYNC;
>   	dax_dev = alloc_dax(pmem, disk->disk_name, &pmem_dax_ops, flags);
>   	if (IS_ERR(dax_dev)) {
> -		return PTR_ERR(dax_dev);
> +		rc = PTR_ERR(dax_dev);
> +		goto out;
>   	}
>   	dax_write_cache(dax_dev, nvdimm_has_cache(nd_region));
>   	pmem->dax_dev = dax_dev;
> @@ -473,8 +476,10 @@ static int pmem_attach_disk(struct device *dev,
>   					  "badblocks");
>   	if (!pmem->bb_state)
>   		dev_warn(dev, "'badblocks' notification disabled\n");
> -
>   	return 0;
> +out:
> +	blk_cleanup_disk(pmem->disk);
> +	return rc;
>   }
>   
>   static int nd_pmem_probe(struct device *dev)

-- 
-----------
Tim Gardner
Canonical, Inc