Allow longer SPA names in stats

Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: gaurkuma <[email protected]> Closes #641
openzfs · Mar 14, 2018 · cbf0dff · cbf0dff
1 parent 3cc0ea2
commit cbf0dff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/sys/kstat.h b/include/sys/kstat.h
@@ -32,7 +32,7 @@
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 
-#define KSTAT_STRLEN            31
+#define KSTAT_STRLEN            255
 #define KSTAT_RAW_MAX		(128*1024)
 
 /* For reference valid classes are:

diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
@@ -614,21 +614,26 @@ kstat_detect_collision(kstat_t *ksp)
 {
 	kstat_module_t *module;
 	kstat_t *tmp;
-	char parent[KSTAT_STRLEN+1];
+	char *parent;
 	char *cp;
 
-	(void) strlcpy(parent, ksp->ks_module, sizeof(parent));
+	parent = kmem_asprintf("%s", ksp->ks_module);
 
-	if ((cp = strrchr(parent, '/')) == NULL)
+	if ((cp = strrchr(parent, '/')) == NULL) {
+		strfree(parent);
 		return (0);
+	}
 
 	cp[0] = '\0';
 	if ((module = kstat_find_module(parent)) != NULL) {
 		list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list)
-			if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0)
+			if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0) {
+				strfree(parent);
 				return (EEXIST);
+			}
 	}
 
+	strfree(parent);
 	return (0);
 }