Update the kstat dataset_name when renaming a zvol

Closes openzfs#15482 (for FreeBSD only) Sponsored-by: Axcient Signed-off-by: Alan Somers <asomers@gmail.com>
asomers · Nov 2, 2023 · 1740ba6 · 1740ba6
1 parent 0527774
commit 1740ba6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/include/sys/dataset_kstats.h b/include/sys/dataset_kstats.h
@@ -71,6 +71,7 @@ typedef struct dataset_kstats {
 
 int dataset_kstats_create(dataset_kstats_t *, objset_t *);
 void dataset_kstats_destroy(dataset_kstats_t *);
+void dataset_kstats_rename(dataset_kstats_t *dk, const char *);
 
 void dataset_kstats_update_write_kstats(dataset_kstats_t *, int64_t);
 void dataset_kstats_update_read_kstats(dataset_kstats_t *, int64_t);

diff --git a/module/os/freebsd/zfs/zvol_os.c b/module/os/freebsd/zfs/zvol_os.c
@@ -1319,6 +1319,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname)
 		}
 	}
 	strlcpy(zv->zv_name, newname, sizeof (zv->zv_name));
+	dataset_kstats_rename(&zv->zv_kstat, newname);
 }
 
 /*

diff --git a/module/zfs/dataset_kstats.c b/module/zfs/dataset_kstats.c
@@ -198,6 +198,18 @@ dataset_kstats_destroy(dataset_kstats_t *dk)
 	zil_sums_fini(&dk->dk_zil_sums);
 }
 
+void
+dataset_kstats_rename(dataset_kstats_t *dk, const char *name) {
+	dataset_kstat_values_t *dkv = dk->dk_kstats->ks_data;
+	char *ds_name;
+
+	ds_name = KSTAT_NAMED_STR_PTR(&dkv->dkv_ds_name);
+	ASSERT3S(ds_name, !=, NULL);
+	ASSERT3S(KSTAT_NAMED_STR_BUFLEN(&dkv->dkv_ds_name), ==,
+		ZFS_MAX_DATASET_NAME_LEN);
+	(void) strlcpy(ds_name, name, ZFS_MAX_DATASET_NAME_LEN);
+}
+
 void
 dataset_kstats_update_write_kstats(dataset_kstats_t *dk,
     int64_t nwritten)