lkml.org 
[lkml]   [2015]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC][PATCH 09/10] zram: remove `num_migrated' from zram_stats
    Date
    drop zram's copy of `num_migrated' objects and use zs_pool's
    zs_get_num_migrated() instead.

    Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    ---
    drivers/block/zram/zram_drv.c | 12 ++++++------
    drivers/block/zram/zram_drv.h | 1 -
    2 files changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
    index 28f6e46..31e45b4 100644
    --- a/drivers/block/zram/zram_drv.c
    +++ b/drivers/block/zram/zram_drv.c
    @@ -385,7 +385,6 @@ static ssize_t comp_algorithm_store(struct device *dev,
    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;

    @@ -396,8 +395,7 @@ static ssize_t compact_store(struct device *dev,
    }

    meta = zram->meta;
    - nr_migrated = zs_compact(meta->mem_pool);
    - atomic64_add(nr_migrated, &zram->stats.num_migrated);
    + zs_compact(meta->mem_pool);
    up_read(&zram->init_lock);

    return len;
    @@ -425,13 +423,15 @@ static ssize_t mm_stat_show(struct device *dev,
    struct device_attribute *attr, char *buf)
    {
    struct zram *zram = dev_to_zram(dev);
    - u64 orig_size, mem_used = 0;
    + u64 orig_size, mem_used = 0, num_migrated = 0;
    long max_used;
    ssize_t ret;

    down_read(&zram->init_lock);
    - if (init_done(zram))
    + if (init_done(zram)) {
    mem_used = zs_get_total_pages(zram->meta->mem_pool);
    + num_migrated = zs_get_num_migrated(zram->meta->mem_pool);
    + }

    orig_size = atomic64_read(&zram->stats.pages_stored);
    max_used = atomic_long_read(&zram->stats.max_used_pages);
    @@ -444,7 +444,7 @@ static ssize_t mm_stat_show(struct device *dev,
    zram->limit_pages << PAGE_SHIFT,
    max_used << PAGE_SHIFT,
    (u64)atomic64_read(&zram->stats.zero_pages),
    - (u64)atomic64_read(&zram->stats.num_migrated));
    + num_migrated);
    up_read(&zram->init_lock);

    return ret;
    diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
    index 6dbe2df..8e92339 100644
    --- a/drivers/block/zram/zram_drv.h
    +++ b/drivers/block/zram/zram_drv.h
    @@ -78,7 +78,6 @@ struct zram_stats {
    atomic64_t compr_data_size; /* compressed size of pages stored */
    atomic64_t num_reads; /* failed + successful */
    atomic64_t num_writes; /* --do-- */
    - atomic64_t num_migrated; /* no. of migrated object */
    atomic64_t failed_reads; /* can happen when memory is too low */
    atomic64_t failed_writes; /* can happen when memory is too low */
    atomic64_t invalid_io; /* non-page-aligned I/O requests */
    --
    2.4.2.337.gfae46aa


    \
     
     \ /
      Last update: 2015-05-29 18:01    [W:6.581 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site