nvdimm/pmem: use add_disk() error handling

Now that device_add_disk() supports returning an error, use
that. We must unwind alloc_dax() on error.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-7-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index cbb3662391c261ae5e67457611613d018958fa5f..6052091f6f59261b13bff8a00f5f296d3bc502bb 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -491,7 +491,9 @@ static int pmem_attach_disk(struct device *dev,
        dax_write_cache(dax_dev, nvdimm_has_cache(nd_region));
        pmem->dax_dev = dax_dev;
 
-       device_add_disk(dev, disk, pmem_attribute_groups);
+       rc = device_add_disk(dev, disk, pmem_attribute_groups);
+       if (rc)
+               goto out_cleanup_dax;
        if (devm_add_action_or_reset(dev, pmem_release_disk, pmem))
                return -ENOMEM;
 
@@ -502,6 +504,10 @@ static int pmem_attach_disk(struct device *dev,
        if (!pmem->bb_state)
                dev_warn(dev, "'badblocks' notification disabled\n");
        return 0;
+
+out_cleanup_dax:
+       kill_dax(pmem->dax_dev);
+       put_dax(pmem->dax_dev);
 out:
        blk_cleanup_disk(pmem->disk);
        return rc;