minor dm.c cleanup
PATCH 1/1 minor dm.c cleanup
Hello Alasdair,
The small patch below:
- Removes the unused md argument from both specific_minor() and next_free_minor()
- Folds kmalloc + memset(0) into a single kzalloc call in alloc_dev()
This has been compile tested on x86.
Regards,
Frederik
Signed-off-by Frederik Deweerdt <[email protected]>
drivers/md/dm.c +5 -6
@@ -924,7 +924,7 @@ static void free_minor(int minor)/* * See if the device with a specific minor # is free. */ -static int specific_minor (struct mapped_device *md,int minor) +static int specific_minor (int minor) {int r, m;
@@ -957,7 +957,7 @@ out:return r; } -static int next_free_minor (struct mapped_device *md,int *minor) +static int next_free_minor (int *minor) {int r, m;
@@ -993,7 +993,7 @@ static struct block_device_operations dm_blk_dops;static struct mapped_device *alloc_dev (int minor) {int r; -struct mapped_device *md =kmalloc (sizeof (*md),GFP_KERNEL ); +struct mapped_device *md =kzalloc (sizeof (*md),GFP_KERNEL );void *old_md;if (!md) {
@@ -1006,13 +1006,12 @@ static struct mapped_device *alloc_dev(int minor)/* get a minor number for the dev */ if (minor ==DM_ANY_MINOR ) - r =next_free_minor (md, &minor); + r =next_free_minor (&minor);else - r =specific_minor (md, minor); + r =specific_minor (minor);if (r <0 ) goto bad_minor; -memset (md,0 ,sizeof (*md));init_rwsem (&md->io_lock);mutex_init (&md->suspend_lock);spin_lock_init (&md->pushback_lock);
Alasdair G Kergon
maintainerQuoted 2 lines · Frederik Deweerdt
- Removes the unused md argument from both
specific_minor()andnext_free_minor()
- Folds kmalloc + memset(0) into a single kzalloc call inalloc_dev()
Added to the batch for 2.6.26, thanks.
Alasdair
Signature · 1 line
[email protected]