diff options
| author | Alexander Motin <[email protected]> | 2020-02-04 11:49:12 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-04 08:49:12 -0800 |
| commit | 741db5a3466236620612772319c3401171d3f2b6 (patch) | |
| tree | a2e1b4bb693457a94ae45e87f29301eaf4210657 | |
| parent | 52c487a0e4432269b0b0ddc034155a8cf62e0299 (diff) | |
Prepare ks_data before calling kstat_install()
It violated sequence described in kstat.h, and at least on FreeBSD
kstat_install() uses provided names to create the sysctls. If the
names are not available at the time, it ends up bad.
Reviewed-by: Igor Kozhukhov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Alexander Motin <[email protected]>
Sponsored-By: iXsystems, Inc.
Closes #9933
| -rw-r--r-- | module/os/linux/zfs/abd.c | 5 | ||||
| -rw-r--r-- | module/zfs/dbuf.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/module/os/linux/zfs/abd.c b/module/os/linux/zfs/abd.c index 40d73de0a..bc6f81000 100644 --- a/module/os/linux/zfs/abd.c +++ b/module/os/linux/zfs/abd.c @@ -573,15 +573,14 @@ abd_init(void) abd_ksp = kstat_create("zfs", 0, "abdstats", "misc", KSTAT_TYPE_NAMED, sizeof (abd_stats) / sizeof (kstat_named_t), KSTAT_FLAG_VIRTUAL); if (abd_ksp != NULL) { - abd_ksp->ks_data = &abd_stats; - kstat_install(abd_ksp); - for (i = 0; i < MAX_ORDER; i++) { snprintf(abd_stats.abdstat_scatter_orders[i].name, KSTAT_STRLEN, "scatter_order_%d", i); abd_stats.abdstat_scatter_orders[i].data_type = KSTAT_DATA_UINT64; } + abd_ksp->ks_data = &abd_stats; + kstat_install(abd_ksp); } } diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index d460f9922..15a8641b9 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -850,10 +850,6 @@ retry: KSTAT_TYPE_NAMED, sizeof (dbuf_stats) / sizeof (kstat_named_t), KSTAT_FLAG_VIRTUAL); if (dbuf_ksp != NULL) { - dbuf_ksp->ks_data = &dbuf_stats; - dbuf_ksp->ks_update = dbuf_kstat_update; - kstat_install(dbuf_ksp); - for (i = 0; i < DN_MAX_LEVELS; i++) { snprintf(dbuf_stats.cache_levels[i].name, KSTAT_STRLEN, "cache_level_%d", i); @@ -864,6 +860,9 @@ retry: dbuf_stats.cache_levels_bytes[i].data_type = KSTAT_DATA_UINT64; } + dbuf_ksp->ks_data = &dbuf_stats; + dbuf_ksp->ks_update = dbuf_kstat_update; + kstat_install(dbuf_ksp); } } |