Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c72c6160 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds
Browse files

zram: move compact_store() to sysfs functions area 



A cosmetic change.  We have a new code layout and keep zram per-device
sysfs store and show functions in one place.  Move compact_store() to that
handlers block to conform to current layout.

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 10447b60

drivers/block/zram/zram_drv.c

+0 −23
Original line number Diff line number Diff line
@@ -63,27 +63,6 @@ static inline struct zram *dev_to_zram(struct device *dev) 
	return (struct zram *)dev_to_disk(dev)->private_data;

}



static ssize_t compact_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t len)

{

	unsigned long nr_migrated;

	struct zram *zram = dev_to_zram(dev);

	struct zram_meta *meta;



	down_read(&zram->init_lock);

	if (!init_done(zram)) {

		up_read(&zram->init_lock);

		return -EINVAL;

	}



	meta = zram->meta;

	nr_migrated = zs_compact(meta->mem_pool);

	atomic64_add(nr_migrated, &zram->stats.num_migrated);

	up_read(&zram->init_lock);



	return len;

}



static ssize_t disksize_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{
@@ -1038,7 +1017,6 @@ static const struct block_device_operations zram_devops = { 
	.owner = THIS_MODULE

};



static DEVICE_ATTR_WO(compact);

static DEVICE_ATTR_RW(disksize);

static DEVICE_ATTR_RO(initstate);

static DEVICE_ATTR_WO(reset);
@@ -1066,7 +1044,6 @@ static struct attribute *zram_disk_attrs[] = { 
	&dev_attr_num_writes.attr,

	&dev_attr_failed_reads.attr,

	&dev_attr_failed_writes.attr,

	&dev_attr_compact.attr,

	&dev_attr_invalid_io.attr,

	&dev_attr_notify_free.attr,

	&dev_attr_zero_pages.attr,