Commit accf58af authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe
Browse files

nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned 



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: 3dd60fb9 ("nvdimm/pmem: stop using q_usage_count as external pgmap refcount")
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-6-mcgrof@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dc104f4b

drivers/nvdimm/pmem.c

+9 −4
Original line number Diff line number Diff line
@@ -457,8 +457,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);
@@ -483,7 +485,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;
@@ -498,8 +501,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)