OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: zram: make global var "devices" use unique name 

The global variable "devices" is too general to be global.
This patch switches the name to be "zram_devices".

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Noah Watkins 2011-07-20 17:05:57 -06:00 committed by Greg Kroah-Hartman
parent 9ac4025d80
commit 43801f6e4e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/zram/zram_drv.c
View File

@ -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");
}

2
drivers/staging/zram/zram_drv.h
View File

@ -123,7 +123,7 @@ struct zram {
struct zram_stats stats;
};
extern struct zram *devices;
extern struct zram *zram_devices;
extern unsigned int num_devices;
#ifdef CONFIG_SYSFS
extern struct attribute_group zram_disk_attr_group;

2
drivers/staging/zram/zram_sysfs.c
View File

@ -35,7 +35,7 @@ static struct zram *dev_to_zram(struct device *dev)
struct zram *zram = NULL;
for (i = 0; i < num_devices; i++) {
zram = &devices[i];
zram = &zram_devices[i];
if (disk_to_dev(zram->disk) == dev)
break;
}