X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=77c7f48f92e3aee3be927e4b34be9c1fa89b01d7;hb=96a9cd4acc079a5d070db9d83e80f551afeda4e8;hp=40e4110b54029e4e1b0a4d3279a0922c480bf9e8;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/nfs.c b/src/nfs.c
index 40e4110b..77c7f48f 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -24,11 +24,8 @@
 #include "common.h"
 #include "plugin.h"
 
-/* #if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) */
-#if KERNEL_LINUX
-# define NFS_HAVE_READ 1
-#else
-# define NFS_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
 /*
@@ -76,17 +73,6 @@ Number      Procedures  Procedures
 21                      commit
 */
 
-static data_source_t procedure_dsrc[1] =
-{
-	{"value", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t procedure_ds =
-{
-	"nfs_procedure", 1, procedure_dsrc
-};
-
-#if NFS_HAVE_READ
 static const char *nfs2_procedures_names[] =
 {
 	"null",
@@ -219,7 +205,6 @@ static void nfs_procedures_submit (const char *plugin_instance,
 	}
 } /* void nfs_procedures_submit */
 
-#if KERNEL_LINUX
 static void nfs_read_stats_file (FILE *fh, char *inst)
 {
 	char buffer[BUFSIZE];
@@ -317,7 +302,6 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
 		}
 	} /* while (fgets (buffer, BUFSIZE, fh) != NULL) */
 } /* void nfs_read_stats_file */
-#endif /* defined(KERNEL_LINUX) */
 #undef BUFSIZE
 
 #if HAVE_LIBKSTAT && 0
@@ -350,7 +334,6 @@ static void nfs2_read_kstat (kstat_t *ksp, char *inst)
 
 static int nfs_read (void)
 {
-#if KERNEL_LINUX
 	FILE *fh;
 
 	if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL)
@@ -365,9 +348,7 @@ static int nfs_read (void)
 		fclose (fh);
 	}
 
-/* #endif defined(KERNEL_LINUX) */
-
-#elif HAVE_LIBKSTAT && 0
+#if HAVE_LIBKSTAT && 0
 	if (nfs2_ksp_client != NULL)
 		nfs2_read_kstat (nfs2_ksp_client, "client");
 	if (nfs2_ksp_server != NULL)
@@ -376,15 +357,8 @@ static int nfs_read (void)
 
 	return (0);
 }
-#endif /* NFS_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&procedure_ds);
-
-#if NFS_HAVE_READ
-	if (load & MR_READ)
-		plugin_register_read ("nfs", nfs_read);
-#endif
+	plugin_register_read ("nfs", nfs_read);
 } /* void module_register */