From 17127bb541a88aa77d278a88a97672961c92c0f5 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Mon, 14 Aug 2006 09:04:16 +0000 Subject: Fixed inode percent free output (Mike Emigh - 1531899) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1469 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/check_disk.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'plugins/check_disk.c') diff --git a/plugins/check_disk.c b/plugins/check_disk.c index e7a3b216..b546fd2f 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -157,7 +157,7 @@ main (int argc, char **argv) uintmax_t total, available, available_to_root, used; double dfree_pct = -1, dused_pct = -1; double dused_units, dfree_units, dtotal_units; - double dused_inodes_percent; + double dused_inodes_percent, dfree_inodes_percent; int temp_result; struct mount_entry *me; @@ -247,6 +247,7 @@ main (int argc, char **argv) dfree_units = available*fsp.fsu_blocksize/mult; dtotal_units = total*fsp.fsu_blocksize/mult; dused_inodes_percent = calculate_percent(fsp.fsu_files - fsp.fsu_ffree, fsp.fsu_files); + dfree_inodes_percent = 100 - dused_inodes_percent; if (verbose >= 3) { printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g\n", @@ -275,15 +276,6 @@ main (int argc, char **argv) if (verbose >=3) printf("Usedinodes_percent result=%d\n", temp_result); result = max_state( result, temp_result ); - - - - - /* Moved this computation up here so we can add it - * to perf */ - inode_space_pct = (1 - dused_inodes_percent) * 100; - - asprintf (&perf, "%s %s", perf, perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, dused_units, units, @@ -305,7 +297,7 @@ main (int argc, char **argv) if (dused_inodes_percent < 0) { asprintf(&output, "%s inode=-);", output); } else { - asprintf(&output, "%s inode=%.0f%%);", output, (1 - dused_inodes_percent) * 100); + asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent ); } } -- cgit v1.2.3