mirror of
https://github.com/torvalds/linux
synced 2024-10-27 21:59:21 +00:00
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:
parent
98069c3f1c
commit
2b15287346
|
@ -1,6 +1,6 @@
|
||||||
config ZRAM
|
config ZRAM
|
||||||
tristate "Compressed RAM block device support"
|
tristate "Compressed RAM block device support"
|
||||||
depends on BLOCK
|
depends on BLOCK && SYSFS
|
||||||
select LZO_COMPRESS
|
select LZO_COMPRESS
|
||||||
select LZO_DECOMPRESS
|
select LZO_DECOMPRESS
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -626,14 +626,12 @@ static int create_device(struct zram *zram, int device_id)
|
||||||
|
|
||||||
add_disk(zram->disk);
|
add_disk(zram->disk);
|
||||||
|
|
||||||
#ifdef CONFIG_SYSFS
|
|
||||||
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
|
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
|
||||||
&zram_disk_attr_group);
|
&zram_disk_attr_group);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_warning("Error creating sysfs group");
|
pr_warning("Error creating sysfs group");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
zram->init_done = 0;
|
zram->init_done = 0;
|
||||||
|
|
||||||
|
@ -643,10 +641,8 @@ static int create_device(struct zram *zram, int device_id)
|
||||||
|
|
||||||
static void destroy_device(struct zram *zram)
|
static void destroy_device(struct zram *zram)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SYSFS
|
|
||||||
sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
|
sysfs_remove_group(&disk_to_dev(zram->disk)->kobj,
|
||||||
&zram_disk_attr_group);
|
&zram_disk_attr_group);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (zram->disk) {
|
if (zram->disk) {
|
||||||
del_gendisk(zram->disk);
|
del_gendisk(zram->disk);
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
|
|
||||||
#include "zram_drv.h"
|
#include "zram_drv.h"
|
||||||
|
|
||||||
#ifdef CONFIG_SYSFS
|
|
||||||
|
|
||||||
static u64 zram_stat64_read(struct zram *zram, u64 *v)
|
static u64 zram_stat64_read(struct zram *zram, u64 *v)
|
||||||
{
|
{
|
||||||
u64 val;
|
u64 val;
|
||||||
|
@ -220,5 +218,3 @@ static struct attribute *zram_disk_attrs[] = {
|
||||||
struct attribute_group zram_disk_attr_group = {
|
struct attribute_group zram_disk_attr_group = {
|
||||||
.attrs = zram_disk_attrs,
|
.attrs = zram_disk_attrs,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* CONFIG_SYSFS */
|
|
||||||
|
|
Loading…
Reference in a new issue