|
@@ -37,7 +37,7 @@
|
|
|
|
|
|
/* Globals */
|
|
|
static int zram_major;
|
|
|
-struct zram *devices;
|
|
|
+struct zram *zram_devices;
|
|
|
|
|
|
/* Module params (documentation at end) */
|
|
|
unsigned int num_devices;
|
|
@@ -801,14 +801,14 @@ static int __init zram_init(void)
|
|
|
|
|
|
/* Allocate the device array and initialize each one */
|
|
|
pr_info("Creating %u devices ...\n", num_devices);
|
|
|
- devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL);
|
|
|
- if (!devices) {
|
|
|
+ zram_devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL);
|
|
|
+ if (!zram_devices) {
|
|
|
ret = -ENOMEM;
|
|
|
goto unregister;
|
|
|
}
|
|
|
|
|
|
for (dev_id = 0; dev_id < num_devices; dev_id++) {
|
|
|
- ret = create_device(&devices[dev_id], dev_id);
|
|
|
+ ret = create_device(&zram_devices[dev_id], dev_id);
|
|
|
if (ret)
|
|
|
goto free_devices;
|
|
|
}
|
|
@@ -817,8 +817,8 @@ static int __init zram_init(void)
|
|
|
|
|
|
free_devices:
|
|
|
while (dev_id)
|
|
|
- destroy_device(&devices[--dev_id]);
|
|
|
- kfree(devices);
|
|
|
+ destroy_device(&zram_devices[--dev_id]);
|
|
|
+ kfree(zram_devices);
|
|
|
unregister:
|
|
|
unregister_blkdev(zram_major, "zram");
|
|
|
out:
|
|
@@ -831,7 +831,7 @@ static void __exit zram_exit(void)
|
|
|
struct zram *zram;
|
|
|
|
|
|
for (i = 0; i < num_devices; i++) {
|
|
|
- zram = &devices[i];
|
|
|
+ zram = &zram_devices[i];
|
|
|
|
|
|
destroy_device(zram);
|
|
|
if (zram->init_done)
|
|
@@ -840,7 +840,7 @@ static void __exit zram_exit(void)
|
|
|
|
|
|
unregister_blkdev(zram_major, "zram");
|
|
|
|
|
|
- kfree(devices);
|
|
|
+ kfree(zram_devices);
|
|
|
pr_debug("Cleanup done!\n");
|
|
|
}
|
|
|
|