Currently, we return 0 if create_device() fails and 1 otherwise.
Now, proper error code is returned from create_device() and the
same is propagated as module error code from ramzswap_init().
Also added some cleanups for ramzswap_init(), improving function
structure.
Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int create_device(struct ramzswap *rzs, int device_id)
{
static int create_device(struct ramzswap *rzs, int device_id)
{
mutex_init(&rzs->lock);
spin_lock_init(&rzs->stat64_lock);
INIT_LIST_HEAD(&rzs->backing_swap_extent_list);
mutex_init(&rzs->lock);
spin_lock_init(&rzs->stat64_lock);
INIT_LIST_HEAD(&rzs->backing_swap_extent_list);
if (!rzs->queue) {
pr_err("Error allocating disk queue for device %d\n",
device_id);
if (!rzs->queue) {
pr_err("Error allocating disk queue for device %d\n",
device_id);
+ ret = -ENOMEM;
+ goto out;
}
blk_queue_make_request(rzs->queue, ramzswap_make_request);
}
blk_queue_make_request(rzs->queue, ramzswap_make_request);
blk_cleanup_queue(rzs->queue);
pr_warning("Error allocating disk structure for device %d\n",
device_id);
blk_cleanup_queue(rzs->queue);
pr_warning("Error allocating disk structure for device %d\n",
device_id);
+ ret = -ENOMEM;
+ goto out;
}
rzs->disk->major = ramzswap_major;
}
rzs->disk->major = ramzswap_major;
add_disk(rzs->disk);
rzs->init_done = 0;
add_disk(rzs->disk);
rzs->init_done = 0;
}
static void destroy_device(struct ramzswap *rzs)
}
static void destroy_device(struct ramzswap *rzs)
static int __init ramzswap_init(void)
{
static int __init ramzswap_init(void)
{
if (num_devices > max_num_devices) {
pr_warning("Invalid value for num_devices: %u\n",
num_devices);
if (num_devices > max_num_devices) {
pr_warning("Invalid value for num_devices: %u\n",
num_devices);
+ ret = -EINVAL;
+ goto out;
}
ramzswap_major = register_blkdev(0, "ramzswap");
if (ramzswap_major <= 0) {
pr_warning("Unable to get major number\n");
}
ramzswap_major = register_blkdev(0, "ramzswap");
if (ramzswap_major <= 0) {
pr_warning("Unable to get major number\n");
+ ret = -EBUSY;
+ goto out;
/* Allocate the device array and initialize each one */
pr_info("Creating %u devices ...\n", num_devices);
devices = kzalloc(num_devices * sizeof(struct ramzswap), GFP_KERNEL);
/* Allocate the device array and initialize each one */
pr_info("Creating %u devices ...\n", num_devices);
devices = kzalloc(num_devices * sizeof(struct ramzswap), GFP_KERNEL);
- if (!devices)
- goto out;
+ if (!devices) {
+ ret = -ENOMEM;
+ goto unregister;
+ }
- for (i = 0; i < num_devices; i++)
- if (!create_device(&devices[i], i)) {
- ret = i;
+ for (dev_id = 0; dev_id < num_devices; dev_id++) {
+ ret = create_device(&devices[dev_id], dev_id);
+ if (ret)
- for (i = 0; i < ret; i++)
- destroy_device(&devices[i]);
-out:
- ret = -ENOMEM;
+ while (dev_id)
+ destroy_device(&devices[--dev_id]);
+unregister:
unregister_blkdev(ramzswap_major, "ramzswap");
unregister_blkdev(ramzswap_major, "ramzswap");