svn commit: r356651 - in head/sys/cddl: compat/opensolaris/kern contrib/opensolaris/uts/common/fs/zfs

Mateusz Guzik mjg at FreeBSD.org
Sun Jan 12 04:53:02 UTC 2020


Author: mjg
Date: Sun Jan 12 04:53:01 2020
New Revision: 356651
URL: https://svnweb.freebsd.org/changeset/base/356651

Log:
  zfs: add missing CLTFLAG_MPSAFE annotations

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c	Sun Jan 12 04:18:36 2020	(r356650)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c	Sun Jan 12 04:53:01 2020	(r356651)
@@ -117,8 +117,8 @@ kstat_install(kstat_t *ksp)
 		    ("data_type=%d", ksent->data_type));
 		SYSCTL_ADD_PROC(&ksp->ks_sysctl_ctx,
 		    SYSCTL_CHILDREN(ksp->ks_sysctl_root), OID_AUTO, ksent->name,
-		    CTLTYPE_U64 | CTLFLAG_RD, ksent, sizeof(*ksent),
-		    kstat_sysctl, "QU", ksent->desc);
+		    CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RD, ksent,
+		    sizeof(*ksent), kstat_sysctl, "QU", ksent->desc);
 	}
 }
 

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Jan 12 04:18:36 2020	(r356650)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Jan 12 04:53:01 2020	(r356651)
@@ -435,11 +435,14 @@ TUNABLE_INT("vfs.zfs.arc_shrink_shift", &zfs_arc_shrin
 TUNABLE_INT("vfs.zfs.arc_grow_retry", &zfs_arc_grow_retry);
 TUNABLE_INT("vfs.zfs.arc_no_grow_shift", &zfs_arc_no_grow_shift);
 SYSCTL_DECL(_vfs_zfs);
-SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_max, CTLTYPE_U64 | CTLFLAG_RWTUN,
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_max,
+    CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RWTUN,
     0, sizeof(uint64_t), sysctl_vfs_zfs_arc_max, "QU", "Maximum ARC size");
-SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_min, CTLTYPE_U64 | CTLFLAG_RWTUN,
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_min,
+    CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RWTUN,
     0, sizeof(uint64_t), sysctl_vfs_zfs_arc_min, "QU", "Minimum ARC size");
-SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_no_grow_shift, CTLTYPE_U32 | CTLFLAG_RWTUN,
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_no_grow_shift,
+    CTLTYPE_U32 | CTLFLAG_MPSAFE | CTLFLAG_RWTUN,
     0, sizeof(uint32_t), sysctl_vfs_zfs_arc_no_grow_shift, "U",
     "log2(fraction of ARC which must be free to allow growing)");
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_average_blocksize, CTLFLAG_RDTUN,


More information about the svn-src-all mailing list