Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sysctl-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull sysctl updates from Luis Chamberlain:
"Just some boring cleanups on the sysctl front for this release"
* tag 'sysctl-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}
kernel/sysctl.c: move sysctl_vals and sysctl_long_vals to sysctl.c
sysctl: remove max_extfrag_threshold
kernel/sysctl.c: remove unnecessary (void*) conversions
proc: remove initialization assignment
+33
-41
+1
-8
fs/proc/proc_sysctl.c
+1
-8
fs/proc/proc_sysctl.c
···
28
28
static const struct file_operations proc_sys_dir_file_operations;
29
29
static const struct inode_operations proc_sys_dir_operations;
30
30
31
-
/* shared constants to be used in various sysctls */
32
-
const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
33
-
EXPORT_SYMBOL(sysctl_vals);
34
-
35
-
const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
36
-
EXPORT_SYMBOL_GPL(sysctl_long_vals);
37
-
38
31
/* Support for permanently empty directories */
39
32
40
33
struct ctl_table sysctl_mount_point[] = {
···
1239
1246
static int insert_links(struct ctl_table_header *head)
1240
1247
{
1241
1248
struct ctl_table_set *root_set = &sysctl_table_root.default_set;
1242
-
struct ctl_dir *core_parent = NULL;
1249
+
struct ctl_dir *core_parent;
1243
1250
struct ctl_table_header *links;
1244
1251
int err;
1245
1252
+20
-23
kernel/sysctl-test.c
+20
-23
kernel/sysctl-test.c
···
9
9
#define KUNIT_PROC_READ 0
10
10
#define KUNIT_PROC_WRITE 1
11
11
12
-
static int i_zero;
13
-
static int i_one_hundred = 100;
14
-
15
12
/*
16
13
* Test that proc_dointvec will not try to use a NULL .data field even when the
17
14
* length is non-zero.
···
26
29
.maxlen = sizeof(int),
27
30
.mode = 0644,
28
31
.proc_handler = proc_dointvec,
29
-
.extra1 = &i_zero,
30
-
.extra2 = &i_one_hundred,
32
+
.extra1 = SYSCTL_ZERO,
33
+
.extra2 = SYSCTL_ONE_HUNDRED,
31
34
};
32
35
/*
33
36
* proc_dointvec expects a buffer in user space, so we allocate one. We
···
76
79
.maxlen = 0,
77
80
.mode = 0644,
78
81
.proc_handler = proc_dointvec,
79
-
.extra1 = &i_zero,
80
-
.extra2 = &i_one_hundred,
82
+
.extra1 = SYSCTL_ZERO,
83
+
.extra2 = SYSCTL_ONE_HUNDRED,
81
84
};
82
85
void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),
83
86
GFP_USER);
···
119
122
.maxlen = sizeof(int),
120
123
.mode = 0644,
121
124
.proc_handler = proc_dointvec,
122
-
.extra1 = &i_zero,
123
-
.extra2 = &i_one_hundred,
125
+
.extra1 = SYSCTL_ZERO,
126
+
.extra2 = SYSCTL_ONE_HUNDRED,
124
127
};
125
128
void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),
126
129
GFP_USER);
···
153
156
.maxlen = sizeof(int),
154
157
.mode = 0644,
155
158
.proc_handler = proc_dointvec,
156
-
.extra1 = &i_zero,
157
-
.extra2 = &i_one_hundred,
159
+
.extra1 = SYSCTL_ZERO,
160
+
.extra2 = SYSCTL_ONE_HUNDRED,
158
161
};
159
162
void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),
160
163
GFP_USER);
···
188
191
.maxlen = sizeof(int),
189
192
.mode = 0644,
190
193
.proc_handler = proc_dointvec,
191
-
.extra1 = &i_zero,
192
-
.extra2 = &i_one_hundred,
194
+
.extra1 = SYSCTL_ZERO,
195
+
.extra2 = SYSCTL_ONE_HUNDRED,
193
196
};
194
197
size_t len = 4;
195
198
loff_t pos = 0;
···
219
222
.maxlen = sizeof(int),
220
223
.mode = 0644,
221
224
.proc_handler = proc_dointvec,
222
-
.extra1 = &i_zero,
223
-
.extra2 = &i_one_hundred,
225
+
.extra1 = SYSCTL_ZERO,
226
+
.extra2 = SYSCTL_ONE_HUNDRED,
224
227
};
225
228
size_t len = 5;
226
229
loff_t pos = 0;
···
248
251
.maxlen = sizeof(int),
249
252
.mode = 0644,
250
253
.proc_handler = proc_dointvec,
251
-
.extra1 = &i_zero,
252
-
.extra2 = &i_one_hundred,
254
+
.extra1 = SYSCTL_ZERO,
255
+
.extra2 = SYSCTL_ONE_HUNDRED,
253
256
};
254
257
char input[] = "9";
255
258
size_t len = sizeof(input) - 1;
···
278
281
.maxlen = sizeof(int),
279
282
.mode = 0644,
280
283
.proc_handler = proc_dointvec,
281
-
.extra1 = &i_zero,
282
-
.extra2 = &i_one_hundred,
284
+
.extra1 = SYSCTL_ZERO,
285
+
.extra2 = SYSCTL_ONE_HUNDRED,
283
286
};
284
287
char input[] = "-9";
285
288
size_t len = sizeof(input) - 1;
···
310
313
.maxlen = sizeof(int),
311
314
.mode = 0644,
312
315
.proc_handler = proc_dointvec,
313
-
.extra1 = &i_zero,
314
-
.extra2 = &i_one_hundred,
316
+
.extra1 = SYSCTL_ZERO,
317
+
.extra2 = SYSCTL_ONE_HUNDRED,
315
318
};
316
319
size_t max_len = 32, len = max_len;
317
320
loff_t pos = 0;
···
348
351
.maxlen = sizeof(int),
349
352
.mode = 0644,
350
353
.proc_handler = proc_dointvec,
351
-
.extra1 = &i_zero,
352
-
.extra2 = &i_one_hundred,
354
+
.extra1 = SYSCTL_ZERO,
355
+
.extra2 = SYSCTL_ONE_HUNDRED,
353
356
};
354
357
size_t max_len = 32, len = max_len;
355
358
loff_t pos = 0;
+12
-10
kernel/sysctl.c
+12
-10
kernel/sysctl.c
···
82
82
#include <linux/rtmutex.h>
83
83
#endif
84
84
85
+
/* shared constants to be used in various sysctls */
86
+
const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
87
+
EXPORT_SYMBOL(sysctl_vals);
88
+
89
+
const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
90
+
EXPORT_SYMBOL_GPL(sysctl_long_vals);
91
+
85
92
#if defined(CONFIG_SYSCTL)
86
93
87
-
/* Constants used for minimum and maximum */
94
+
/* Constants used for minimum and maximum */
88
95
89
96
#ifdef CONFIG_PERF_EVENTS
90
97
static const int six_hundred_forty_kb = 640 * 1024;
···
134
127
#if defined(HAVE_ARCH_PICK_MMAP_LAYOUT) || \
135
128
defined(CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT)
136
129
int sysctl_legacy_va_layout;
137
-
#endif
138
-
139
-
#ifdef CONFIG_COMPACTION
140
-
/* min_extfrag_threshold is SYSCTL_ZERO */;
141
-
static const int max_extfrag_threshold = 1000;
142
130
#endif
143
131
144
132
#endif /* CONFIG_SYSCTL */
···
1054
1052
return 0;
1055
1053
}
1056
1054
1057
-
i = (unsigned long *) data;
1058
-
min = (unsigned long *) table->extra1;
1059
-
max = (unsigned long *) table->extra2;
1055
+
i = data;
1056
+
min = table->extra1;
1057
+
max = table->extra2;
1060
1058
vleft = table->maxlen / sizeof(unsigned long);
1061
1059
left = *lenp;
1062
1060
···
2218
2216
.mode = 0644,
2219
2217
.proc_handler = proc_dointvec_minmax,
2220
2218
.extra1 = SYSCTL_ZERO,
2221
-
.extra2 = (void *)&max_extfrag_threshold,
2219
+
.extra2 = SYSCTL_ONE_THOUSAND,
2222
2220
},
2223
2221
{
2224
2222
.procname = "compact_unevictable_allowed",