diff options
| author | Karel Zak | 2015-09-24 12:46:21 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-09-24 12:46:21 +0200 |
| commit | 1ceb4077af59a32cdfde954a84c1dd7c0b5b84ed (patch) | |
| tree | e7726ce9c3deccd832d31b3469c0cd813be87fcc /sys-utils/zramctl.c | |
| parent | libblkid: add read() based fallback for char (UBI) devs (diff) | |
| download | kernel-qcow2-util-linux-1ceb4077af59a32cdfde954a84c1dd7c0b5b84ed.tar.gz kernel-qcow2-util-linux-1ceb4077af59a32cdfde954a84c1dd7c0b5b84ed.tar.xz kernel-qcow2-util-linux-1ceb4077af59a32cdfde954a84c1dd7c0b5b84ed.zip | |
zramctl: fix lists of the all devices
The command zramctl lists the same stat info for all devices (DATA COMPR TOTAL).
Reported-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/zramctl.c')
| -rw-r--r-- | sys-utils/zramctl.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c index 30134338f..8d60b6ccc 100644 --- a/sys-utils/zramctl.c +++ b/sys-utils/zramctl.c @@ -35,6 +35,7 @@ #include "optutils.h" #include "ismounted.h" #include "strv.h" +#include "path.h" /*#define CONFIG_ZRAM_DEBUG*/ @@ -145,6 +146,15 @@ static int column_name_to_id(const char *name, size_t namesz) return -1; } +static void zram_reset_stat(struct zram *z) +{ + if (z) { + strv_free(z->mm_stat); + z->mm_stat = NULL; + z->mm_stat_probed = 0; + } +} + static void zram_set_devname(struct zram *z, const char *devname, size_t n) { assert(z); @@ -158,6 +168,7 @@ static void zram_set_devname(struct zram *z, const char *devname, size_t n) DBG(fprintf(stderr, "set devname: %s", z->devname)); sysfs_deinit(&z->sysfs); + zram_reset_stat(z); } static struct zram *new_zram(const char *devname) @@ -176,8 +187,7 @@ static void free_zram(struct zram *z) return; DBG(fprintf(stderr, "free: %p", z)); sysfs_deinit(&z->sysfs); - - strv_free(z->mm_stat); + zram_reset_stat(z); free(z); } @@ -271,7 +281,6 @@ static struct zram *find_free_zram(void) return z; } -#include "path.h" static char *get_mm_stat(struct zram *z, size_t idx, int bytes) { |