Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 56992309ccbe71f4321ddd50ee2f76f91b412c1a

Authored by Eric W. Biederman
1 parent ab09203e30

sysctl kernel: Remove binary sysctl logic 

Now that sys_sysctl is a generic wrapper around /proc/sys  .ctl_name
and .strategy members of sysctl tables are dead code.  Remove them.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Showing 3 changed files with 3 additions and 38 deletions Side-by-side Diff

... ... @@ -7373,17 +7373,16 @@
7373 7373 .procname = "sched_domain",
7374 7374 .mode = 0555,
7375 7375 },
7376   - {0, },
  7376 + {}
7377 7377 };
7378 7378  
7379 7379 static struct ctl_table sd_ctl_root[] = {
7380 7380 {
7381   - .ctl_name = CTL_KERN,
7382 7381 .procname = "kernel",
7383 7382 .mode = 0555,
7384 7383 .child = sd_ctl_dir,
7385 7384 },
7386   - {0, },
  7385 + {}
7387 7386 };
7388 7387  
7389 7388 static struct ctl_table *sd_alloc_ctl_entry(int n)
... ... @@ -52,7 +52,6 @@
52 52  
53 53 ctl_table slow_work_sysctls[] = {
54 54 {
55   - .ctl_name = CTL_UNNUMBERED,
56 55 .procname = "min-threads",
57 56 .data = &slow_work_min_threads,
58 57 .maxlen = sizeof(unsigned),
... ... @@ -62,7 +61,6 @@
62 61 .extra2 = &slow_work_max_threads,
63 62 },
64 63 {
65   - .ctl_name = CTL_UNNUMBERED,
66 64 .procname = "max-threads",
67 65 .data = &slow_work_max_threads,
68 66 .maxlen = sizeof(unsigned),
... ... @@ -72,7 +70,6 @@
72 70 .extra2 = (void *) &slow_work_max_max_threads,
73 71 },
74 72 {
75   - .ctl_name = CTL_UNNUMBERED,
76 73 .procname = "vslow-percentage",
77 74 .data = &vslow_work_proportion,
78 75 .maxlen = sizeof(unsigned),
... ... @@ -81,7 +78,7 @@
81 78 .extra1 = (void *) &slow_work_min_vslow,
82 79 .extra2 = (void *) &slow_work_max_vslow,
83 80 },
84   - { .ctl_name = 0 }
  81 + {}
85 82 };
86 83 #endif
87 84  
kernel/utsname_sysctl.c
Diff comments   View file @ 5699230
... ... @@ -57,78 +57,47 @@
57 57 #define proc_do_uts_string NULL
58 58 #endif
59 59  
60   -
61   -#ifdef CONFIG_SYSCTL_SYSCALL
62   -/* The generic string strategy routine: */
63   -static int sysctl_uts_string(ctl_table *table,
64   - void __user *oldval, size_t __user *oldlenp,
65   - void __user *newval, size_t newlen)
66   -{
67   - struct ctl_table uts_table;
68   - int r, write;
69   - write = newval && newlen;
70   - memcpy(&uts_table, table, sizeof(uts_table));
71   - uts_table.data = get_uts(table, write);
72   - r = sysctl_string(&uts_table, oldval, oldlenp, newval, newlen);
73   - put_uts(table, write, uts_table.data);
74   - return r;
75   -}
76   -#else
77   -#define sysctl_uts_string NULL
78   -#endif
79   -
80 60 static struct ctl_table uts_kern_table[] = {
81 61 {
82   - .ctl_name = KERN_OSTYPE,
83 62 .procname = "ostype",
84 63 .data = init_uts_ns.name.sysname,
85 64 .maxlen = sizeof(init_uts_ns.name.sysname),
86 65 .mode = 0444,
87 66 .proc_handler = proc_do_uts_string,
88   - .strategy = sysctl_uts_string,
89 67 },
90 68 {
91   - .ctl_name = KERN_OSRELEASE,
92 69 .procname = "osrelease",
93 70 .data = init_uts_ns.name.release,
94 71 .maxlen = sizeof(init_uts_ns.name.release),
95 72 .mode = 0444,
96 73 .proc_handler = proc_do_uts_string,
97   - .strategy = sysctl_uts_string,
98 74 },
99 75 {
100   - .ctl_name = KERN_VERSION,
101 76 .procname = "version",
102 77 .data = init_uts_ns.name.version,
103 78 .maxlen = sizeof(init_uts_ns.name.version),
104 79 .mode = 0444,
105 80 .proc_handler = proc_do_uts_string,
106   - .strategy = sysctl_uts_string,
107 81 },
108 82 {
109   - .ctl_name = KERN_NODENAME,
110 83 .procname = "hostname",
111 84 .data = init_uts_ns.name.nodename,
112 85 .maxlen = sizeof(init_uts_ns.name.nodename),
113 86 .mode = 0644,
114 87 .proc_handler = proc_do_uts_string,
115   - .strategy = sysctl_uts_string,
116 88 },
117 89 {
118   - .ctl_name = KERN_DOMAINNAME,
119 90 .procname = "domainname",
120 91 .data = init_uts_ns.name.domainname,
121 92 .maxlen = sizeof(init_uts_ns.name.domainname),
122 93 .mode = 0644,
123 94 .proc_handler = proc_do_uts_string,
124   - .strategy = sysctl_uts_string,
125 95 },
126 96 {}
127 97 };
128 98  
129 99 static struct ctl_table uts_root_table[] = {
130 100 {
131   - .ctl_name = CTL_KERN,
132 101 .procname = "kernel",
133 102 .mode = 0555,
134 103 .child = uts_kern_table,