svn commit: r310014 - head/sys/compat/linuxkpi/common/include/linux

Ed Schouten ed at FreeBSD.org
Tue Dec 13 07:58:31 UTC 2016


Author: ed
Date: Tue Dec 13 07:58:30 2016
New Revision: 310014
URL: https://svnweb.freebsd.org/changeset/base/310014

Log:
  Remove the only user of sysctl_add_oid().
  
  My plan is to change this function's prototype at some point in the
  future to add a new label argument, which can be used to export all of
  sysctl as metrics that can be scraped by Prometheus. Switch over this
  caller to use the macro wrapper counterpart.

Modified:
  head/sys/compat/linuxkpi/common/include/linux/sysfs.h

Modified: head/sys/compat/linuxkpi/common/include/linux/sysfs.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/sysfs.h	Tue Dec 13 06:54:13 2016	(r310013)
+++ head/sys/compat/linuxkpi/common/include/linux/sysfs.h	Tue Dec 13 07:58:30 2016	(r310014)
@@ -126,7 +126,7 @@ static inline int
 sysfs_create_file(struct kobject *kobj, const struct attribute *attr)
 {
 
-	sysctl_add_oid(NULL, SYSCTL_CHILDREN(kobj->oidp), OID_AUTO,
+	SYSCTL_ADD_OID(NULL, SYSCTL_CHILDREN(kobj->oidp), OID_AUTO,
 	    attr->name, CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_MPSAFE, kobj,
 	    (uintptr_t)attr, sysctl_handle_attr, "A", "");
 
@@ -158,7 +158,7 @@ sysfs_create_group(struct kobject *kobj,
 	oidp = SYSCTL_ADD_NODE(NULL, SYSCTL_CHILDREN(kobj->oidp),
 	    OID_AUTO, grp->name, CTLFLAG_RD|CTLFLAG_MPSAFE, NULL, grp->name);
 	for (attr = grp->attrs; *attr != NULL; attr++) {
-		sysctl_add_oid(NULL, SYSCTL_CHILDREN(oidp), OID_AUTO,
+		SYSCTL_ADD_OID(NULL, SYSCTL_CHILDREN(oidp), OID_AUTO,
 		    (*attr)->name, CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_MPSAFE,
 		    kobj, (uintptr_t)*attr, sysctl_handle_attr, "A", "");
 	}


More information about the svn-src-head mailing list