<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From: Milan Broz &lt;mbroz@redhat.com&gt;

Tidy labels in alloc_dev to make later patches more clear.

No functional change in this patch.
 
Signed-off-by: Milan Broz &lt;mbroz@redhat.com&gt;
Signed-off-by: Alasdair G Kergon &lt;agk@redhat.com&gt;
---
 drivers/md/dm.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

Index: linux-2.6.24/drivers/md/dm.c
===================================================================
--- linux-2.6.24.orig/drivers/md/dm.c	2008-02-07 13:48:16.000000000 +0000
+++ linux-2.6.24/drivers/md/dm.c	2008-02-07 13:48:20.000000000 +0000
@@ -982,7 +982,7 @@ static struct mapped_device *alloc_dev(i
 	}
 
 	if (!try_module_get(THIS_MODULE))
-		goto bad0;
+		goto bad_module_get;
 
 	/* get a minor number for the dev */
 	if (minor == DM_ANY_MINOR)
@@ -990,7 +990,7 @@ static struct mapped_device *alloc_dev(i
 	else
 		r = specific_minor(md, minor);
 	if (r &lt; 0)
-		goto bad1;
+		goto bad_minor;
 
 	memset(md, 0, sizeof(*md));
 	init_rwsem(&amp;md-&gt;io_lock);
@@ -1006,7 +1006,7 @@ static struct mapped_device *alloc_dev(i
 
 	md-&gt;queue = blk_alloc_queue(GFP_KERNEL);
 	if (!md-&gt;queue)
-		goto bad1_free_minor;
+		goto bad_queue;
 
 	md-&gt;queue-&gt;queuedata = md;
 	md-&gt;queue-&gt;backing_dev_info.congested_fn = dm_any_congested;
@@ -1017,11 +1017,11 @@ static struct mapped_device *alloc_dev(i
 
 	md-&gt;io_pool = mempool_create_slab_pool(MIN_IOS, _io_cache);
 	if (!md-&gt;io_pool)
-		goto bad2;
+		goto bad_io_pool;
 
 	md-&gt;tio_pool = mempool_create_slab_pool(MIN_IOS, _tio_cache);
 	if (!md-&gt;tio_pool)
-		goto bad3;
+		goto bad_tio_pool;
 
 	md-&gt;bs = bioset_create(16, 16);
 	if (!md-&gt;bs)
@@ -1029,7 +1029,7 @@ static struct mapped_device *alloc_dev(i
 
 	md-&gt;disk = alloc_disk(1);
 	if (!md-&gt;disk)
-		goto bad4;
+		goto bad_disk;
 
 	atomic_set(&amp;md-&gt;pending, 0);
 	init_waitqueue_head(&amp;md-&gt;wait);
@@ -1053,19 +1053,19 @@ static struct mapped_device *alloc_dev(i
 
 	return md;
 
- bad4:
+bad_disk:
 	bioset_free(md-&gt;bs);
- bad_no_bioset:
+bad_no_bioset:
 	mempool_destroy(md-&gt;tio_pool);
- bad3:
+bad_tio_pool:
 	mempool_destroy(md-&gt;io_pool);
- bad2:
+bad_io_pool:
 	blk_cleanup_queue(md-&gt;queue);
- bad1_free_minor:
+bad_queue:
 	free_minor(minor);
- bad1:
+bad_minor:
 	module_put(THIS_MODULE);
- bad0:
+bad_module_get:
 	kfree(md);
 	return NULL;
 }
</pre></body></html>