ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zramctl: make mm_stat parser more robust 

Let's fallback to attribute files if mm_stat file is incomplete. It
should not happen, but I have seen RHEL7 kernel where is no
num_migrated/pages_compacted attribute...

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-03-30 12:10:01 +02:00
parent 9ff67eb9c8
commit 2546d54bd8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys-utils/zramctl.c
View File

@ -359,8 +359,12 @@ static char *get_mm_stat(struct zram *z, size_t idx, int bytes)
str = sysfs_strdup(sysfs, "mm_stat");
if (str) {
z->mm_stat = strv_split(str, " ");
if (strv_length(z->mm_stat) < ARRAY_SIZE(mm_stat_names))
errx(EXIT_FAILURE, _("Failed to parse mm_stat"));
/* make sure kernel provides mm_stat as expected */
if (strv_length(z->mm_stat) < ARRAY_SIZE(mm_stat_names)) {
strv_free(z->mm_stat);
z->mm_stat = NULL;
}
}
z->mm_stat_probed = 1;
free(str);