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

Staging: zram: make ZRAM depends on SYSFS 

We can not configure zram device without sysfs anyway, so make zram
depends on it.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jerome Marchand 2010-12-17 16:59:33 +01:00 committed by Greg Kroah-Hartman
parent 98069c3f1c
commit 2b15287346
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/zram/Kconfig
View File

@ -1,6 +1,6 @@
config ZRAM
tristate "Compressed RAM block device support"
depends on BLOCK
depends on BLOCK && SYSFS
select LZO_COMPRESS
select LZO_DECOMPRESS
default n

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

@ -626,14 +626,12 @@ static int create_device(struct zram *zram, int device_id)
add_disk(zram->disk);
#ifdef CONFIG_SYSFS
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);
if (ret < 0) {
pr_warning("Error creating sysfs group");
goto out;
}
#endif
zram->init_done = 0;
@ -643,10 +641,8 @@ out:
static void destroy_device(struct zram *zram)
{
#ifdef CONFIG_SYSFS
sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);
#endif
if (zram->disk) {
del_gendisk(zram->disk);

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

@ -17,8 +17,6 @@
#include "zram_drv.h"
#ifdef CONFIG_SYSFS
static u64 zram_stat64_read(struct zram *zram, u64 *v)
{
u64 val;
@ -220,5 +218,3 @@ static struct attribute *zram_disk_attrs[] = {
struct attribute_group zram_disk_attr_group = {
.attrs = zram_disk_attrs,
};
#endif /* CONFIG_SYSFS */