X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fzfs_arc.c;h=af4bfccb467baf84cd48f27b25f92e52d875972f;hp=8f3b1b4b4bb59ace40c7dc1558f2950b0e7ac6a9;hb=22813e1a6a3d059efc67975893df985052661a7a;hpb=161388c36cb939d4ea2e33614103208b57bcfd15 diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 8f3b1b4b..af4bfccb 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -207,26 +207,21 @@ static int za_read(void) { return -1; } - ksp = llist_create(); - if (ksp == NULL) { - ERROR("zfs_arc plugin: `llist_create' failed."); - fclose(fh); - return -1; - } - - // Ignore the first two lines because they contain information about - // the rest of the file. - // See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel - // module. - if (fgets(buffer, sizeof(buffer), fh) == NULL) { - ERROR("zfs_arc plugin: \"%s\" does not contain a single line.", + /* Ignore the first two lines because they contain information about the rest + * of the file. + * See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel module. + */ + if ((fgets(buffer, sizeof(buffer), fh) == NULL) || + (fgets(buffer, sizeof(buffer), fh) == NULL)) { + ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", ZOL_ARCSTATS_FILE); fclose(fh); return -1; } - if (fgets(buffer, sizeof(buffer), fh) == NULL) { - ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", - ZOL_ARCSTATS_FILE); + + ksp = llist_create(); + if (ksp == NULL) { + ERROR("zfs_arc plugin: `llist_create' failed."); fclose(fh); return -1; }