[PATCH v3] nvdimm/btt: do not call del_gendisk() if not needed

[PATCH v3] nvdimm/btt: do not call del_gendisk() if not needed

[Luis Chamberlain]

del_gendisk() should not called if the disk has not been added. Fix this.

Fixes: 41cd8b70c37a ("libnvdimm, btt: add support for blk integrity")
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---

This v3 just makes it clear that this is just wrong regarless of the
kernel, and adds Christoph's Reviewed-by tag.

 drivers/nvdimm/btt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index f10a50ffa047..a62f23b945f1 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1537,7 +1537,6 @@ static int btt_blk_init(struct btt *btt)
 		int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
 
 		if (rc) {
-			del_gendisk(btt->btt_disk);
 			blk_cleanup_disk(btt->btt_disk);
 			return rc;
 		}
-- 
2.33.0

Re: [PATCH v3] nvdimm/btt: do not call del_gendisk() if not needed

[Jens Axboe]

On Wed, 3 Nov 2021 09:58:43 -0700, Luis Chamberlain wrote:
> del_gendisk() should not called if the disk has not been added. Fix this.
> 
> 

Applied, thanks!

[1/1] nvdimm/btt: do not call del_gendisk() if not needed
      commit: 3aefb5ee843fbe4789d03bb181e190d462df95e4

Best regards,
-- 
Jens Axboe