Thread (31 messages) 31 messages, 2 authors, 2021-08-30

Re: [PATCH 08/10] dm: add add_disk() error handling

From: Christoph Hellwig <hch@infradead.org>
Date: 2021-08-24 06:26:18
Also in: dm-devel, linux-block, linux-nvme, linux-scsi, lkml

On Mon, Aug 23, 2021 at 01:29:28PM -0700, Luis Chamberlain wrote:
-	add_disk(md->disk);
+	r = add_disk(md->disk);
+	if (r)
+		goto out_cleanup_disk;
 
 	r = dm_sysfs_init(md);
-	if (r) {
-		del_gendisk(md->disk);
-		return r;
-	}
+	if (r)
+		goto out_del_gendisk;
 	md->type = type;
 	return 0;
+
+out_cleanup_disk:
+	blk_cleanup_disk(md->disk);
+out_del_gendisk:
+	del_gendisk(md->disk);
+	return r;
I think the add_disk should just return r.  If you look at the
callers they eventualy end up in dm_table_destroy, which does
this cleanup.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help