Commit be2d1d56 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds

zram: drop `init_done' struct zram member

Introduce init_done() helper function which allows us to drop `init_done'
struct zram member.  init_done() uses the fact that ->init_done == 1
equals to ->meta != NULL.
Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
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 ed12d845
...@@ -42,6 +42,11 @@ static struct zram *zram_devices; ...@@ -42,6 +42,11 @@ static struct zram *zram_devices;
/* Module params (documentation at end) */ /* Module params (documentation at end) */
static unsigned int num_devices = 1; static unsigned int num_devices = 1;
static inline int init_done(struct zram *zram)
{
return zram->meta != NULL;
}
static inline struct zram *dev_to_zram(struct device *dev) static inline struct zram *dev_to_zram(struct device *dev)
{ {
return (struct zram *)dev_to_disk(dev)->private_data; return (struct zram *)dev_to_disk(dev)->private_data;
...@@ -60,7 +65,7 @@ static ssize_t initstate_show(struct device *dev, ...@@ -60,7 +65,7 @@ static ssize_t initstate_show(struct device *dev,
{ {
struct zram *zram = dev_to_zram(dev); struct zram *zram = dev_to_zram(dev);
return sprintf(buf, "%u\n", zram->init_done); return sprintf(buf, "%u\n", init_done(zram));
} }
static ssize_t num_reads_show(struct device *dev, static ssize_t num_reads_show(struct device *dev,
...@@ -133,7 +138,7 @@ static ssize_t mem_used_total_show(struct device *dev, ...@@ -133,7 +138,7 @@ static ssize_t mem_used_total_show(struct device *dev,
struct zram_meta *meta = zram->meta; struct zram_meta *meta = zram->meta;
down_read(&zram->init_lock); down_read(&zram->init_lock);
if (zram->init_done) if (init_done(zram))
val = zs_get_total_size_bytes(meta->mem_pool); val = zs_get_total_size_bytes(meta->mem_pool);
up_read(&zram->init_lock); up_read(&zram->init_lock);
...@@ -546,14 +551,12 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity) ...@@ -546,14 +551,12 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
struct zram_meta *meta; struct zram_meta *meta;
down_write(&zram->init_lock); down_write(&zram->init_lock);
if (!zram->init_done) { if (!init_done(zram)) {
up_write(&zram->init_lock); up_write(&zram->init_lock);
return; return;
} }
meta = zram->meta; meta = zram->meta;
zram->init_done = 0;
/* Free all pages that are still in this zram device */ /* Free all pages that are still in this zram device */
for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) { for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) {
unsigned long handle = meta->table[index].handle; unsigned long handle = meta->table[index].handle;
...@@ -594,8 +597,6 @@ static void zram_init_device(struct zram *zram, struct zram_meta *meta) ...@@ -594,8 +597,6 @@ static void zram_init_device(struct zram *zram, struct zram_meta *meta)
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue); queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
zram->meta = meta; zram->meta = meta;
zram->init_done = 1;
pr_debug("Initialization done!\n"); pr_debug("Initialization done!\n");
} }
...@@ -615,7 +616,7 @@ static ssize_t disksize_store(struct device *dev, ...@@ -615,7 +616,7 @@ static ssize_t disksize_store(struct device *dev,
if (!meta) if (!meta)
return -ENOMEM; return -ENOMEM;
down_write(&zram->init_lock); down_write(&zram->init_lock);
if (zram->init_done) { if (init_done(zram)) {
up_write(&zram->init_lock); up_write(&zram->init_lock);
zram_meta_free(meta); zram_meta_free(meta);
pr_info("Cannot change disksize for initialized device\n"); pr_info("Cannot change disksize for initialized device\n");
...@@ -736,7 +737,7 @@ static void zram_make_request(struct request_queue *queue, struct bio *bio) ...@@ -736,7 +737,7 @@ static void zram_make_request(struct request_queue *queue, struct bio *bio)
struct zram *zram = queue->queuedata; struct zram *zram = queue->queuedata;
down_read(&zram->init_lock); down_read(&zram->init_lock);
if (unlikely(!zram->init_done)) if (unlikely(!init_done(zram)))
goto error; goto error;
if (!valid_io_request(zram, bio)) { if (!valid_io_request(zram, bio)) {
...@@ -859,7 +860,7 @@ static int create_device(struct zram *zram, int device_id) ...@@ -859,7 +860,7 @@ static int create_device(struct zram *zram, int device_id)
goto out_free_disk; goto out_free_disk;
} }
zram->init_done = 0; zram->meta = NULL;
return 0; return 0;
out_free_disk: out_free_disk:
......
...@@ -95,7 +95,6 @@ struct zram { ...@@ -95,7 +95,6 @@ struct zram {
struct zram_meta *meta; struct zram_meta *meta;
struct request_queue *queue; struct request_queue *queue;
struct gendisk *disk; struct gendisk *disk;
int init_done;
/* Prevent concurrent execution of device init, reset and R/W request */ /* Prevent concurrent execution of device init, reset and R/W request */
struct rw_semaphore init_lock; struct rw_semaphore init_lock;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment