From: Stathis Kamperis <beket@dragonflybsd.org>
Date: Sat, 7 Nov 2009 23:08:47 +0000 (+0200)
Subject: Garbage collect ghost sysctl.
X-Git-Tag: v2.7.1~380^2~13^2~20
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/aefc0c83985eb3387b4e629771713496e9508154

Garbage collect ghost sysctl.

p1003_1b.mq_open_max sysctl:

1. Has never worked properly (displayed a wrong value).
2. Didn't allow for its value to be tuned.
3. Is non-standard, so no 3rd party should rely on it. And, thus, noone
   should be harmed by its removal.
   The canonical way to get the maximum open message queue descriptors
   per process is via the sysconf(3) interface.
4. Has now been replaced by kern.mqueue.mq_open_max sysctl which
   addresses 1. and 2.

A stub has been inserted in place of the old sysctl definitions, in order to
reduce unnecessary diffs due to renumbering. This patch does NOT introduce
p1003_1b.unused1.

Partially-discussed-with: swildner@
---

diff --git a/sys/kern/kern_posix4_mib.c b/sys/kern/kern_posix4_mib.c
index 543a6af720..9254d66abf 100644
--- a/sys/kern/kern_posix4_mib.c
+++ b/sys/kern/kern_posix4_mib.c
@@ -83,7 +83,6 @@ P1B_SYSCTL(CTL_P1003_1B_AIO_LISTIO_MAX, aio_listio_max);
 P1B_SYSCTL(CTL_P1003_1B_AIO_MAX, aio_max);
 P1B_SYSCTL(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, aio_prio_delta_max);
 P1B_SYSCTL(CTL_P1003_1B_DELAYTIMER_MAX, delaytimer_max);
-P1B_SYSCTL(CTL_P1003_1B_MQ_OPEN_MAX, mq_open_max);
 P1B_SYSCTL(CTL_P1003_1B_PAGESIZE, pagesize);
 P1B_SYSCTL(CTL_P1003_1B_RTSIG_MAX, rtsig_max);
 P1B_SYSCTL(CTL_P1003_1B_SEM_NSEMS_MAX, sem_nsems_max);
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 4391b6d928..f8023fb146 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -552,7 +552,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 #define CTL_P1003_1B_AIO_MAX			16	/* int */
 #define CTL_P1003_1B_AIO_PRIO_DELTA_MAX		17	/* int */
 #define CTL_P1003_1B_DELAYTIMER_MAX		18	/* int */
-#define CTL_P1003_1B_MQ_OPEN_MAX		19	/* int */
+#define CTL_P1003_1B_UNUSED1			19	/* int */
 #define CTL_P1003_1B_PAGESIZE			20	/* int */
 #define CTL_P1003_1B_RTSIG_MAX			21	/* int */
 #define CTL_P1003_1B_SEM_NSEMS_MAX		22	/* int */
@@ -582,7 +582,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 	{ "aio_max", CTLTYPE_INT }, \
 	{ "aio_prio_delta_max", CTLTYPE_INT }, \
 	{ "delaytimer_max", CTLTYPE_INT }, \
-	{ "mq_open_max", CTLTYPE_INT }, \
+	{ "unused1", CTLTYPE_INT }, \
 	{ "pagesize", CTLTYPE_INT }, \
 	{ "rtsig_max", CTLTYPE_INT }, \
 	{ "nsems_max", CTLTYPE_INT }, \