Merge tag 'for-4.17/block-20180402' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / drivers / nvdimm / blk.c

diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 7bde764f939ab84283cb04b4c961f1a8c8fc5e39..62e9cb167aad520228bc55a97348ab75b07ddd36 100644 (file)
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -278,8 +278,6 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
        disk->queue             = q;
        disk->flags             = GENHD_FL_EXT_DEVT;
        nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name);
-       set_capacity(disk, 0);
-       device_add_disk(dev, disk);
 
        if (devm_add_action_or_reset(dev, nd_blk_release_disk, disk))
                return -ENOMEM;
@@ -292,6 +290,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
        }
 
        set_capacity(disk, available_disk_size >> SECTOR_SHIFT);
+       device_add_disk(dev, disk);
        revalidate_disk(disk);
        return 0;
 }