diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-16 06:11:48 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-18 11:37:40 -0500 |
commit | 6d4561110a3e9fa742aeec6717248a491dfb1878 (patch) | |
tree | 689e2abf19940416ce597ba56ed31026ff59bd21 /net | |
parent | 86926d0096279b9739ceeff40f68d3c33b9119a9 (diff) |
sysctl: Drop & in front of every proc_handler.
For consistency drop & in front of every proc_handler. Explicity
taking the address is unnecessary and it prevents optimizations
like stubbing the proc_handlers to NULL.
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/rds/ib_sysctl.c | 12 | ||||
-rw-r--r-- | net/rds/iw_sysctl.c | 12 | ||||
-rw-r--r-- | net/rds/sysctl.c | 10 | ||||
-rw-r--r-- | net/sctp/sysctl.c | 2 | ||||
-rw-r--r-- | net/sunrpc/sysctl.c | 10 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma.c | 24 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/transport.c | 12 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 10 |
8 files changed, 46 insertions, 46 deletions
diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index 517c6c9987ba..03f01cb4e0fe 100644 --- a/net/rds/ib_sysctl.c +++ b/net/rds/ib_sysctl.c | |||
@@ -71,7 +71,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
71 | .data = &rds_ib_sysctl_max_send_wr, | 71 | .data = &rds_ib_sysctl_max_send_wr, |
72 | .maxlen = sizeof(unsigned long), | 72 | .maxlen = sizeof(unsigned long), |
73 | .mode = 0644, | 73 | .mode = 0644, |
74 | .proc_handler = &proc_doulongvec_minmax, | 74 | .proc_handler = proc_doulongvec_minmax, |
75 | .extra1 = &rds_ib_sysctl_max_wr_min, | 75 | .extra1 = &rds_ib_sysctl_max_wr_min, |
76 | .extra2 = &rds_ib_sysctl_max_wr_max, | 76 | .extra2 = &rds_ib_sysctl_max_wr_max, |
77 | }, | 77 | }, |
@@ -80,7 +80,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
80 | .data = &rds_ib_sysctl_max_recv_wr, | 80 | .data = &rds_ib_sysctl_max_recv_wr, |
81 | .maxlen = sizeof(unsigned long), | 81 | .maxlen = sizeof(unsigned long), |
82 | .mode = 0644, | 82 | .mode = 0644, |
83 | .proc_handler = &proc_doulongvec_minmax, | 83 | .proc_handler = proc_doulongvec_minmax, |
84 | .extra1 = &rds_ib_sysctl_max_wr_min, | 84 | .extra1 = &rds_ib_sysctl_max_wr_min, |
85 | .extra2 = &rds_ib_sysctl_max_wr_max, | 85 | .extra2 = &rds_ib_sysctl_max_wr_max, |
86 | }, | 86 | }, |
@@ -89,7 +89,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
89 | .data = &rds_ib_sysctl_max_unsig_wrs, | 89 | .data = &rds_ib_sysctl_max_unsig_wrs, |
90 | .maxlen = sizeof(unsigned long), | 90 | .maxlen = sizeof(unsigned long), |
91 | .mode = 0644, | 91 | .mode = 0644, |
92 | .proc_handler = &proc_doulongvec_minmax, | 92 | .proc_handler = proc_doulongvec_minmax, |
93 | .extra1 = &rds_ib_sysctl_max_unsig_wr_min, | 93 | .extra1 = &rds_ib_sysctl_max_unsig_wr_min, |
94 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, | 94 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, |
95 | }, | 95 | }, |
@@ -98,7 +98,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
98 | .data = &rds_ib_sysctl_max_unsig_bytes, | 98 | .data = &rds_ib_sysctl_max_unsig_bytes, |
99 | .maxlen = sizeof(unsigned long), | 99 | .maxlen = sizeof(unsigned long), |
100 | .mode = 0644, | 100 | .mode = 0644, |
101 | .proc_handler = &proc_doulongvec_minmax, | 101 | .proc_handler = proc_doulongvec_minmax, |
102 | .extra1 = &rds_ib_sysctl_max_unsig_bytes_min, | 102 | .extra1 = &rds_ib_sysctl_max_unsig_bytes_min, |
103 | .extra2 = &rds_ib_sysctl_max_unsig_bytes_max, | 103 | .extra2 = &rds_ib_sysctl_max_unsig_bytes_max, |
104 | }, | 104 | }, |
@@ -107,14 +107,14 @@ ctl_table rds_ib_sysctl_table[] = { | |||
107 | .data = &rds_ib_sysctl_max_recv_allocation, | 107 | .data = &rds_ib_sysctl_max_recv_allocation, |
108 | .maxlen = sizeof(unsigned long), | 108 | .maxlen = sizeof(unsigned long), |
109 | .mode = 0644, | 109 | .mode = 0644, |
110 | .proc_handler = &proc_doulongvec_minmax, | 110 | .proc_handler = proc_doulongvec_minmax, |
111 | }, | 111 | }, |
112 | { | 112 | { |
113 | .procname = "flow_control", | 113 | .procname = "flow_control", |
114 | .data = &rds_ib_sysctl_flow_control, | 114 | .data = &rds_ib_sysctl_flow_control, |
115 | .maxlen = sizeof(rds_ib_sysctl_flow_control), | 115 | .maxlen = sizeof(rds_ib_sysctl_flow_control), |
116 | .mode = 0644, | 116 | .mode = 0644, |
117 | .proc_handler = &proc_dointvec, | 117 | .proc_handler = proc_dointvec, |
118 | }, | 118 | }, |
119 | { } | 119 | { } |
120 | }; | 120 | }; |
diff --git a/net/rds/iw_sysctl.c b/net/rds/iw_sysctl.c index 3e00b01559f2..1c4428a61a02 100644 --- a/net/rds/iw_sysctl.c +++ b/net/rds/iw_sysctl.c | |||
@@ -61,7 +61,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
61 | .data = &rds_iw_sysctl_max_send_wr, | 61 | .data = &rds_iw_sysctl_max_send_wr, |
62 | .maxlen = sizeof(unsigned long), | 62 | .maxlen = sizeof(unsigned long), |
63 | .mode = 0644, | 63 | .mode = 0644, |
64 | .proc_handler = &proc_doulongvec_minmax, | 64 | .proc_handler = proc_doulongvec_minmax, |
65 | .extra1 = &rds_iw_sysctl_max_wr_min, | 65 | .extra1 = &rds_iw_sysctl_max_wr_min, |
66 | .extra2 = &rds_iw_sysctl_max_wr_max, | 66 | .extra2 = &rds_iw_sysctl_max_wr_max, |
67 | }, | 67 | }, |
@@ -70,7 +70,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
70 | .data = &rds_iw_sysctl_max_recv_wr, | 70 | .data = &rds_iw_sysctl_max_recv_wr, |
71 | .maxlen = sizeof(unsigned long), | 71 | .maxlen = sizeof(unsigned long), |
72 | .mode = 0644, | 72 | .mode = 0644, |
73 | .proc_handler = &proc_doulongvec_minmax, | 73 | .proc_handler = proc_doulongvec_minmax, |
74 | .extra1 = &rds_iw_sysctl_max_wr_min, | 74 | .extra1 = &rds_iw_sysctl_max_wr_min, |
75 | .extra2 = &rds_iw_sysctl_max_wr_max, | 75 | .extra2 = &rds_iw_sysctl_max_wr_max, |
76 | }, | 76 | }, |
@@ -79,7 +79,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
79 | .data = &rds_iw_sysctl_max_unsig_wrs, | 79 | .data = &rds_iw_sysctl_max_unsig_wrs, |
80 | .maxlen = sizeof(unsigned long), | 80 | .maxlen = sizeof(unsigned long), |
81 | .mode = 0644, | 81 | .mode = 0644, |
82 | .proc_handler = &proc_doulongvec_minmax, | 82 | .proc_handler = proc_doulongvec_minmax, |
83 | .extra1 = &rds_iw_sysctl_max_unsig_wr_min, | 83 | .extra1 = &rds_iw_sysctl_max_unsig_wr_min, |
84 | .extra2 = &rds_iw_sysctl_max_unsig_wr_max, | 84 | .extra2 = &rds_iw_sysctl_max_unsig_wr_max, |
85 | }, | 85 | }, |
@@ -88,7 +88,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
88 | .data = &rds_iw_sysctl_max_unsig_bytes, | 88 | .data = &rds_iw_sysctl_max_unsig_bytes, |
89 | .maxlen = sizeof(unsigned long), | 89 | .maxlen = sizeof(unsigned long), |
90 | .mode = 0644, | 90 | .mode = 0644, |
91 | .proc_handler = &proc_doulongvec_minmax, | 91 | .proc_handler = proc_doulongvec_minmax, |
92 | .extra1 = &rds_iw_sysctl_max_unsig_bytes_min, | 92 | .extra1 = &rds_iw_sysctl_max_unsig_bytes_min, |
93 | .extra2 = &rds_iw_sysctl_max_unsig_bytes_max, | 93 | .extra2 = &rds_iw_sysctl_max_unsig_bytes_max, |
94 | }, | 94 | }, |
@@ -97,14 +97,14 @@ ctl_table rds_iw_sysctl_table[] = { | |||
97 | .data = &rds_iw_sysctl_max_recv_allocation, | 97 | .data = &rds_iw_sysctl_max_recv_allocation, |
98 | .maxlen = sizeof(unsigned long), | 98 | .maxlen = sizeof(unsigned long), |
99 | .mode = 0644, | 99 | .mode = 0644, |
100 | .proc_handler = &proc_doulongvec_minmax, | 100 | .proc_handler = proc_doulongvec_minmax, |
101 | }, | 101 | }, |
102 | { | 102 | { |
103 | .procname = "flow_control", | 103 | .procname = "flow_control", |
104 | .data = &rds_iw_sysctl_flow_control, | 104 | .data = &rds_iw_sysctl_flow_control, |
105 | .maxlen = sizeof(rds_iw_sysctl_flow_control), | 105 | .maxlen = sizeof(rds_iw_sysctl_flow_control), |
106 | .mode = 0644, | 106 | .mode = 0644, |
107 | .proc_handler = &proc_dointvec, | 107 | .proc_handler = proc_dointvec, |
108 | }, | 108 | }, |
109 | { } | 109 | { } |
110 | }; | 110 | }; |
diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c index 8fb499ee3687..7829a20325d3 100644 --- a/net/rds/sysctl.c +++ b/net/rds/sysctl.c | |||
@@ -55,7 +55,7 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
55 | .data = &rds_sysctl_reconnect_min_jiffies, | 55 | .data = &rds_sysctl_reconnect_min_jiffies, |
56 | .maxlen = sizeof(unsigned long), | 56 | .maxlen = sizeof(unsigned long), |
57 | .mode = 0644, | 57 | .mode = 0644, |
58 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 58 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
59 | .extra1 = &rds_sysctl_reconnect_min, | 59 | .extra1 = &rds_sysctl_reconnect_min, |
60 | .extra2 = &rds_sysctl_reconnect_max_jiffies, | 60 | .extra2 = &rds_sysctl_reconnect_max_jiffies, |
61 | }, | 61 | }, |
@@ -64,7 +64,7 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
64 | .data = &rds_sysctl_reconnect_max_jiffies, | 64 | .data = &rds_sysctl_reconnect_max_jiffies, |
65 | .maxlen = sizeof(unsigned long), | 65 | .maxlen = sizeof(unsigned long), |
66 | .mode = 0644, | 66 | .mode = 0644, |
67 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 67 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
68 | .extra1 = &rds_sysctl_reconnect_min_jiffies, | 68 | .extra1 = &rds_sysctl_reconnect_min_jiffies, |
69 | .extra2 = &rds_sysctl_reconnect_max, | 69 | .extra2 = &rds_sysctl_reconnect_max, |
70 | }, | 70 | }, |
@@ -73,21 +73,21 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
73 | .data = &rds_sysctl_max_unacked_packets, | 73 | .data = &rds_sysctl_max_unacked_packets, |
74 | .maxlen = sizeof(unsigned long), | 74 | .maxlen = sizeof(unsigned long), |
75 | .mode = 0644, | 75 | .mode = 0644, |
76 | .proc_handler = &proc_dointvec, | 76 | .proc_handler = proc_dointvec, |
77 | }, | 77 | }, |
78 | { | 78 | { |
79 | .procname = "max_unacked_bytes", | 79 | .procname = "max_unacked_bytes", |
80 | .data = &rds_sysctl_max_unacked_bytes, | 80 | .data = &rds_sysctl_max_unacked_bytes, |
81 | .maxlen = sizeof(unsigned long), | 81 | .maxlen = sizeof(unsigned long), |
82 | .mode = 0644, | 82 | .mode = 0644, |
83 | .proc_handler = &proc_dointvec, | 83 | .proc_handler = proc_dointvec, |
84 | }, | 84 | }, |
85 | { | 85 | { |
86 | .procname = "ping_enable", | 86 | .procname = "ping_enable", |
87 | .data = &rds_sysctl_ping_enable, | 87 | .data = &rds_sysctl_ping_enable, |
88 | .maxlen = sizeof(int), | 88 | .maxlen = sizeof(int), |
89 | .mode = 0644, | 89 | .mode = 0644, |
90 | .proc_handler = &proc_dointvec, | 90 | .proc_handler = proc_dointvec, |
91 | }, | 91 | }, |
92 | { } | 92 | { } |
93 | }; | 93 | }; |
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index c4ece9829541..d50a042f9552 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c | |||
@@ -237,7 +237,7 @@ static ctl_table sctp_table[] = { | |||
237 | .data = &sctp_scope_policy, | 237 | .data = &sctp_scope_policy, |
238 | .maxlen = sizeof(int), | 238 | .maxlen = sizeof(int), |
239 | .mode = 0644, | 239 | .mode = 0644, |
240 | .proc_handler = &proc_dointvec_minmax, | 240 | .proc_handler = proc_dointvec_minmax, |
241 | .extra1 = &zero, | 241 | .extra1 = &zero, |
242 | .extra2 = &addr_scope_max, | 242 | .extra2 = &addr_scope_max, |
243 | }, | 243 | }, |
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index f0ce326d0178..e65dcc613339 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c | |||
@@ -139,34 +139,34 @@ static ctl_table debug_table[] = { | |||
139 | .data = &rpc_debug, | 139 | .data = &rpc_debug, |
140 | .maxlen = sizeof(int), | 140 | .maxlen = sizeof(int), |
141 | .mode = 0644, | 141 | .mode = 0644, |
142 | .proc_handler = &proc_dodebug | 142 | .proc_handler = proc_dodebug |
143 | }, | 143 | }, |
144 | { | 144 | { |
145 | .procname = "nfs_debug", | 145 | .procname = "nfs_debug", |
146 | .data = &nfs_debug, | 146 | .data = &nfs_debug, |
147 | .maxlen = sizeof(int), | 147 | .maxlen = sizeof(int), |
148 | .mode = 0644, | 148 | .mode = 0644, |
149 | .proc_handler = &proc_dodebug | 149 | .proc_handler = proc_dodebug |
150 | }, | 150 | }, |
151 | { | 151 | { |
152 | .procname = "nfsd_debug", | 152 | .procname = "nfsd_debug", |
153 | .data = &nfsd_debug, | 153 | .data = &nfsd_debug, |
154 | .maxlen = sizeof(int), | 154 | .maxlen = sizeof(int), |
155 | .mode = 0644, | 155 | .mode = 0644, |
156 | .proc_handler = &proc_dodebug | 156 | .proc_handler = proc_dodebug |
157 | }, | 157 | }, |
158 | { | 158 | { |
159 | .procname = "nlm_debug", | 159 | .procname = "nlm_debug", |
160 | .data = &nlm_debug, | 160 | .data = &nlm_debug, |
161 | .maxlen = sizeof(int), | 161 | .maxlen = sizeof(int), |
162 | .mode = 0644, | 162 | .mode = 0644, |
163 | .proc_handler = &proc_dodebug | 163 | .proc_handler = proc_dodebug |
164 | }, | 164 | }, |
165 | { | 165 | { |
166 | .procname = "transports", | 166 | .procname = "transports", |
167 | .maxlen = 256, | 167 | .maxlen = 256, |
168 | .mode = 0444, | 168 | .mode = 0444, |
169 | .proc_handler = &proc_do_xprt, | 169 | .proc_handler = proc_do_xprt, |
170 | }, | 170 | }, |
171 | { } | 171 | { } |
172 | }; | 172 | }; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c index 678cee22013f..5b8a8ff93a25 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c +++ b/net/sunrpc/xprtrdma/svc_rdma.c | |||
@@ -120,7 +120,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
120 | .data = &svcrdma_max_requests, | 120 | .data = &svcrdma_max_requests, |
121 | .maxlen = sizeof(unsigned int), | 121 | .maxlen = sizeof(unsigned int), |
122 | .mode = 0644, | 122 | .mode = 0644, |
123 | .proc_handler = &proc_dointvec_minmax, | 123 | .proc_handler = proc_dointvec_minmax, |
124 | .extra1 = &min_max_requests, | 124 | .extra1 = &min_max_requests, |
125 | .extra2 = &max_max_requests | 125 | .extra2 = &max_max_requests |
126 | }, | 126 | }, |
@@ -129,7 +129,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
129 | .data = &svcrdma_max_req_size, | 129 | .data = &svcrdma_max_req_size, |
130 | .maxlen = sizeof(unsigned int), | 130 | .maxlen = sizeof(unsigned int), |
131 | .mode = 0644, | 131 | .mode = 0644, |
132 | .proc_handler = &proc_dointvec_minmax, | 132 | .proc_handler = proc_dointvec_minmax, |
133 | .extra1 = &min_max_inline, | 133 | .extra1 = &min_max_inline, |
134 | .extra2 = &max_max_inline | 134 | .extra2 = &max_max_inline |
135 | }, | 135 | }, |
@@ -138,7 +138,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
138 | .data = &svcrdma_ord, | 138 | .data = &svcrdma_ord, |
139 | .maxlen = sizeof(unsigned int), | 139 | .maxlen = sizeof(unsigned int), |
140 | .mode = 0644, | 140 | .mode = 0644, |
141 | .proc_handler = &proc_dointvec_minmax, | 141 | .proc_handler = proc_dointvec_minmax, |
142 | .extra1 = &min_ord, | 142 | .extra1 = &min_ord, |
143 | .extra2 = &max_ord, | 143 | .extra2 = &max_ord, |
144 | }, | 144 | }, |
@@ -148,63 +148,63 @@ static ctl_table svcrdma_parm_table[] = { | |||
148 | .data = &rdma_stat_read, | 148 | .data = &rdma_stat_read, |
149 | .maxlen = sizeof(atomic_t), | 149 | .maxlen = sizeof(atomic_t), |
150 | .mode = 0644, | 150 | .mode = 0644, |
151 | .proc_handler = &read_reset_stat, | 151 | .proc_handler = read_reset_stat, |
152 | }, | 152 | }, |
153 | { | 153 | { |
154 | .procname = "rdma_stat_recv", | 154 | .procname = "rdma_stat_recv", |
155 | .data = &rdma_stat_recv, | 155 | .data = &rdma_stat_recv, |
156 | .maxlen = sizeof(atomic_t), | 156 | .maxlen = sizeof(atomic_t), |
157 | .mode = 0644, | 157 | .mode = 0644, |
158 | .proc_handler = &read_reset_stat, | 158 | .proc_handler = read_reset_stat, |
159 | }, | 159 | }, |
160 | { | 160 | { |
161 | .procname = "rdma_stat_write", | 161 | .procname = "rdma_stat_write", |
162 | .data = &rdma_stat_write, | 162 | .data = &rdma_stat_write, |
163 | .maxlen = sizeof(atomic_t), | 163 | .maxlen = sizeof(atomic_t), |
164 | .mode = 0644, | 164 | .mode = 0644, |
165 | .proc_handler = &read_reset_stat, | 165 | .proc_handler = read_reset_stat, |
166 | }, | 166 | }, |
167 | { | 167 | { |
168 | .procname = "rdma_stat_sq_starve", | 168 | .procname = "rdma_stat_sq_starve", |
169 | .data = &rdma_stat_sq_starve, | 169 | .data = &rdma_stat_sq_starve, |
170 | .maxlen = sizeof(atomic_t), | 170 | .maxlen = sizeof(atomic_t), |
171 | .mode = 0644, | 171 | .mode = 0644, |
172 | .proc_handler = &read_reset_stat, | 172 | .proc_handler = read_reset_stat, |
173 | }, | 173 | }, |
174 | { | 174 | { |
175 | .procname = "rdma_stat_rq_starve", | 175 | .procname = "rdma_stat_rq_starve", |
176 | .data = &rdma_stat_rq_starve, | 176 | .data = &rdma_stat_rq_starve, |
177 | .maxlen = sizeof(atomic_t), | 177 | .maxlen = sizeof(atomic_t), |
178 | .mode = 0644, | 178 | .mode = 0644, |
179 | .proc_handler = &read_reset_stat, | 179 | .proc_handler = read_reset_stat, |
180 | }, | 180 | }, |
181 | { | 181 | { |
182 | .procname = "rdma_stat_rq_poll", | 182 | .procname = "rdma_stat_rq_poll", |
183 | .data = &rdma_stat_rq_poll, | 183 | .data = &rdma_stat_rq_poll, |
184 | .maxlen = sizeof(atomic_t), | 184 | .maxlen = sizeof(atomic_t), |
185 | .mode = 0644, | 185 | .mode = 0644, |
186 | .proc_handler = &read_reset_stat, | 186 | .proc_handler = read_reset_stat, |
187 | }, | 187 | }, |
188 | { | 188 | { |
189 | .procname = "rdma_stat_rq_prod", | 189 | .procname = "rdma_stat_rq_prod", |
190 | .data = &rdma_stat_rq_prod, | 190 | .data = &rdma_stat_rq_prod, |
191 | .maxlen = sizeof(atomic_t), | 191 | .maxlen = sizeof(atomic_t), |
192 | .mode = 0644, | 192 | .mode = 0644, |
193 | .proc_handler = &read_reset_stat, | 193 | .proc_handler = read_reset_stat, |
194 | }, | 194 | }, |
195 | { | 195 | { |
196 | .procname = "rdma_stat_sq_poll", | 196 | .procname = "rdma_stat_sq_poll", |
197 | .data = &rdma_stat_sq_poll, | 197 | .data = &rdma_stat_sq_poll, |
198 | .maxlen = sizeof(atomic_t), | 198 | .maxlen = sizeof(atomic_t), |
199 | .mode = 0644, | 199 | .mode = 0644, |
200 | .proc_handler = &read_reset_stat, | 200 | .proc_handler = read_reset_stat, |
201 | }, | 201 | }, |
202 | { | 202 | { |
203 | .procname = "rdma_stat_sq_prod", | 203 | .procname = "rdma_stat_sq_prod", |
204 | .data = &rdma_stat_sq_prod, | 204 | .data = &rdma_stat_sq_prod, |
205 | .maxlen = sizeof(atomic_t), | 205 | .maxlen = sizeof(atomic_t), |
206 | .mode = 0644, | 206 | .mode = 0644, |
207 | .proc_handler = &read_reset_stat, | 207 | .proc_handler = read_reset_stat, |
208 | }, | 208 | }, |
209 | { }, | 209 | { }, |
210 | }; | 210 | }; |
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 476816062243..7018eef1dcdd 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c | |||
@@ -90,7 +90,7 @@ static ctl_table xr_tunables_table[] = { | |||
90 | .data = &xprt_rdma_slot_table_entries, | 90 | .data = &xprt_rdma_slot_table_entries, |
91 | .maxlen = sizeof(unsigned int), | 91 | .maxlen = sizeof(unsigned int), |
92 | .mode = 0644, | 92 | .mode = 0644, |
93 | .proc_handler = &proc_dointvec_minmax, | 93 | .proc_handler = proc_dointvec_minmax, |
94 | .extra1 = &min_slot_table_size, | 94 | .extra1 = &min_slot_table_size, |
95 | .extra2 = &max_slot_table_size | 95 | .extra2 = &max_slot_table_size |
96 | }, | 96 | }, |
@@ -99,21 +99,21 @@ static ctl_table xr_tunables_table[] = { | |||
99 | .data = &xprt_rdma_max_inline_read, | 99 | .data = &xprt_rdma_max_inline_read, |
100 | .maxlen = sizeof(unsigned int), | 100 | .maxlen = sizeof(unsigned int), |
101 | .mode = 0644, | 101 | .mode = 0644, |
102 | .proc_handler = &proc_dointvec, | 102 | .proc_handler = proc_dointvec, |
103 | }, | 103 | }, |
104 | { | 104 | { |
105 | .procname = "rdma_max_inline_write", | 105 | .procname = "rdma_max_inline_write", |
106 | .data = &xprt_rdma_max_inline_write, | 106 | .data = &xprt_rdma_max_inline_write, |
107 | .maxlen = sizeof(unsigned int), | 107 | .maxlen = sizeof(unsigned int), |
108 | .mode = 0644, | 108 | .mode = 0644, |
109 | .proc_handler = &proc_dointvec, | 109 | .proc_handler = proc_dointvec, |
110 | }, | 110 | }, |
111 | { | 111 | { |
112 | .procname = "rdma_inline_write_padding", | 112 | .procname = "rdma_inline_write_padding", |
113 | .data = &xprt_rdma_inline_write_padding, | 113 | .data = &xprt_rdma_inline_write_padding, |
114 | .maxlen = sizeof(unsigned int), | 114 | .maxlen = sizeof(unsigned int), |
115 | .mode = 0644, | 115 | .mode = 0644, |
116 | .proc_handler = &proc_dointvec_minmax, | 116 | .proc_handler = proc_dointvec_minmax, |
117 | .extra1 = &zero, | 117 | .extra1 = &zero, |
118 | .extra2 = &max_padding, | 118 | .extra2 = &max_padding, |
119 | }, | 119 | }, |
@@ -122,7 +122,7 @@ static ctl_table xr_tunables_table[] = { | |||
122 | .data = &xprt_rdma_memreg_strategy, | 122 | .data = &xprt_rdma_memreg_strategy, |
123 | .maxlen = sizeof(unsigned int), | 123 | .maxlen = sizeof(unsigned int), |
124 | .mode = 0644, | 124 | .mode = 0644, |
125 | .proc_handler = &proc_dointvec_minmax, | 125 | .proc_handler = proc_dointvec_minmax, |
126 | .extra1 = &min_memreg, | 126 | .extra1 = &min_memreg, |
127 | .extra2 = &max_memreg, | 127 | .extra2 = &max_memreg, |
128 | }, | 128 | }, |
@@ -131,7 +131,7 @@ static ctl_table xr_tunables_table[] = { | |||
131 | .data = &xprt_rdma_pad_optimize, | 131 | .data = &xprt_rdma_pad_optimize, |
132 | .maxlen = sizeof(unsigned int), | 132 | .maxlen = sizeof(unsigned int), |
133 | .mode = 0644, | 133 | .mode = 0644, |
134 | .proc_handler = &proc_dointvec, | 134 | .proc_handler = proc_dointvec, |
135 | }, | 135 | }, |
136 | { }, | 136 | { }, |
137 | }; | 137 | }; |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 8b9a2079f2e3..04732d09013e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -85,7 +85,7 @@ static ctl_table xs_tunables_table[] = { | |||
85 | .data = &xprt_udp_slot_table_entries, | 85 | .data = &xprt_udp_slot_table_entries, |
86 | .maxlen = sizeof(unsigned int), | 86 | .maxlen = sizeof(unsigned int), |
87 | .mode = 0644, | 87 | .mode = 0644, |
88 | .proc_handler = &proc_dointvec_minmax, | 88 | .proc_handler = proc_dointvec_minmax, |
89 | .extra1 = &min_slot_table_size, | 89 | .extra1 = &min_slot_table_size, |
90 | .extra2 = &max_slot_table_size | 90 | .extra2 = &max_slot_table_size |
91 | }, | 91 | }, |
@@ -94,7 +94,7 @@ static ctl_table xs_tunables_table[] = { | |||
94 | .data = &xprt_tcp_slot_table_entries, | 94 | .data = &xprt_tcp_slot_table_entries, |
95 | .maxlen = sizeof(unsigned int), | 95 | .maxlen = sizeof(unsigned int), |
96 | .mode = 0644, | 96 | .mode = 0644, |
97 | .proc_handler = &proc_dointvec_minmax, | 97 | .proc_handler = proc_dointvec_minmax, |
98 | .extra1 = &min_slot_table_size, | 98 | .extra1 = &min_slot_table_size, |
99 | .extra2 = &max_slot_table_size | 99 | .extra2 = &max_slot_table_size |
100 | }, | 100 | }, |
@@ -103,7 +103,7 @@ static ctl_table xs_tunables_table[] = { | |||
103 | .data = &xprt_min_resvport, | 103 | .data = &xprt_min_resvport, |
104 | .maxlen = sizeof(unsigned int), | 104 | .maxlen = sizeof(unsigned int), |
105 | .mode = 0644, | 105 | .mode = 0644, |
106 | .proc_handler = &proc_dointvec_minmax, | 106 | .proc_handler = proc_dointvec_minmax, |
107 | .extra1 = &xprt_min_resvport_limit, | 107 | .extra1 = &xprt_min_resvport_limit, |
108 | .extra2 = &xprt_max_resvport_limit | 108 | .extra2 = &xprt_max_resvport_limit |
109 | }, | 109 | }, |
@@ -112,7 +112,7 @@ static ctl_table xs_tunables_table[] = { | |||
112 | .data = &xprt_max_resvport, | 112 | .data = &xprt_max_resvport, |
113 | .maxlen = sizeof(unsigned int), | 113 | .maxlen = sizeof(unsigned int), |
114 | .mode = 0644, | 114 | .mode = 0644, |
115 | .proc_handler = &proc_dointvec_minmax, | 115 | .proc_handler = proc_dointvec_minmax, |
116 | .extra1 = &xprt_min_resvport_limit, | 116 | .extra1 = &xprt_min_resvport_limit, |
117 | .extra2 = &xprt_max_resvport_limit | 117 | .extra2 = &xprt_max_resvport_limit |
118 | }, | 118 | }, |
@@ -121,7 +121,7 @@ static ctl_table xs_tunables_table[] = { | |||
121 | .data = &xs_tcp_fin_timeout, | 121 | .data = &xs_tcp_fin_timeout, |
122 | .maxlen = sizeof(xs_tcp_fin_timeout), | 122 | .maxlen = sizeof(xs_tcp_fin_timeout), |
123 | .mode = 0644, | 123 | .mode = 0644, |
124 | .proc_handler = &proc_dointvec_jiffies, | 124 | .proc_handler = proc_dointvec_jiffies, |
125 | }, | 125 | }, |
126 | { }, | 126 | { }, |
127 | }; | 127 | }; |