Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff658e9c authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Mike Snitzer
Browse files

dm mpath: simplify failure path of dm_multipath_init() 



Currently the cleanup of all error cases are open-coded.  Introduce a
common exit path and labels.

Signed-off-by: default avatarJohannes Thumshirn <morbidrsa@gmail.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 9cb1397d

drivers/md/dm-mpath.c

+15 −9
Original line number Diff line number Diff line
@@ -1733,16 +1733,15 @@ static int __init dm_multipath_init(void) 
	r = dm_register_target(&multipath_target);

	if (r < 0) {

		DMERR("register failed %d", r);

		kmem_cache_destroy(_mpio_cache);

		return -EINVAL;

		r = -EINVAL;

		goto bad_register_target;

	}



	kmultipathd = alloc_workqueue("kmpathd", WQ_MEM_RECLAIM, 0);

	if (!kmultipathd) {

		DMERR("failed to create workqueue kmpathd");

		dm_unregister_target(&multipath_target);

		kmem_cache_destroy(_mpio_cache);

		return -ENOMEM;

		r = -ENOMEM;

		goto bad_alloc_kmultipathd;

	}



	/*
@@ -1755,16 +1754,23 @@ static int __init dm_multipath_init(void) 
						  WQ_MEM_RECLAIM);

	if (!kmpath_handlerd) {

		DMERR("failed to create workqueue kmpath_handlerd");

		destroy_workqueue(kmultipathd);

		dm_unregister_target(&multipath_target);

		kmem_cache_destroy(_mpio_cache);

		return -ENOMEM;

		r = -ENOMEM;

		goto bad_alloc_kmpath_handlerd;

	}



	DMINFO("version %u.%u.%u loaded",

	       multipath_target.version[0], multipath_target.version[1],

	       multipath_target.version[2]);



	return 0;



bad_alloc_kmpath_handlerd:

	destroy_workqueue(kmultipathd);

bad_alloc_kmultipathd:

	dm_unregister_target(&multipath_target);

bad_register_target:

	kmem_cache_destroy(_mpio_cache);



	return r;

}