X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=5d37f9f1e0078ab73d3581138c55a1c18fc7be77;hb=446184cb9cf0b21d3e387d426f2249d4a8aa0557;hp=e589184c2cf0fe6b898762270a47462c33d299fa;hpb=7a8cd12cc66a349106a34a7655944cfeac71d7c5;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index e589184c..5d37f9f1 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -208,26 +208,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; }