From: Andy Grover <andy.grover@oracle.com>
Date: Tue, 24 Nov 2009 23:35:51 +0000 (-0800)
Subject: RDS: Re-add pf/sol access via sysctl
X-Git-Tag: v4.1.12-92~319^2^2~2^2~98
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20f63f7e8feef251a1f20d75a15b49581fa6b83d;p=users%2Fjedix%2Flinux-maple.git

RDS: Re-add pf/sol access via sysctl

Although RDS has an official PF_RDS value now, existing software
expects to look for rds sysctls to determine it. We need to maintain
these for now, for backwards compatibility.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
---

diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c
index 307dc5c1be15..d319a0c8edd7 100644
--- a/net/rds/sysctl.c
+++ b/net/rds/sysctl.c
@@ -49,6 +49,13 @@ unsigned int  rds_sysctl_max_unacked_bytes = (16 << 20);
 
 unsigned int rds_sysctl_ping_enable = 1;
 
+/*
+ * We have official values, but must maintain the sysctl interface for existing
+ * software that expects to find these values here.
+ */
+static int rds_sysctl_pf_rds = PF_RDS;
+static int rds_sysctl_sol_rds = SOL_RDS;
+
 static ctl_table rds_sysctl_rds_table[] = {
 	{
 		.ctl_name       = CTL_UNNUMBERED,
@@ -70,6 +77,22 @@ static ctl_table rds_sysctl_rds_table[] = {
 		.extra1		= &rds_sysctl_reconnect_min_jiffies,
 		.extra2		= &rds_sysctl_reconnect_max,
 	},
+	{
+		.ctl_name       = CTL_UNNUMBERED,
+		.procname       = "pf_rds",
+		.data		= &rds_sysctl_pf_rds,
+		.maxlen         = sizeof(int),
+		.mode           = 0444,
+		.proc_handler   = &proc_dointvec,
+	},
+	{
+		.ctl_name       = CTL_UNNUMBERED,
+		.procname       = "sol_rds",
+		.data		= &rds_sysctl_sol_rds,
+		.maxlen         = sizeof(int),
+		.mode           = 0444,
+		.proc_handler   = &proc_dointvec,
+	},
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "max_unacked_packets",