sysctl: Remove the last of the generic binary sysctl support
Now that all of the users stopped using ctl_name and strategy it is safe to remove the fields from struct ctl_table, and it is safe to remove the stub strategy routines as well. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Родитель
f8572d8f2a
Коммит
4739a9748e
|
@ -1033,7 +1033,6 @@ extern ctl_handler sysctl_ms_jiffies;
|
|||
/* A sysctl table is an array of struct ctl_table: */
|
||||
struct ctl_table
|
||||
{
|
||||
int ctl_name; /* Binary ID */
|
||||
const char *procname; /* Text ID for /proc/sys, or zero */
|
||||
void *data;
|
||||
int maxlen;
|
||||
|
@ -1041,7 +1040,6 @@ struct ctl_table
|
|||
struct ctl_table *child;
|
||||
struct ctl_table *parent; /* Automatically set */
|
||||
proc_handler *proc_handler; /* Callback for text formatting */
|
||||
ctl_handler *strategy; /* Callback function for all r/w */
|
||||
void *extra1;
|
||||
void *extra2;
|
||||
};
|
||||
|
@ -1075,7 +1073,6 @@ struct ctl_table_header
|
|||
/* struct ctl_path describes where in the hierarchy a table is added */
|
||||
struct ctl_path {
|
||||
const char *procname;
|
||||
int ctl_name;
|
||||
};
|
||||
|
||||
void register_sysctl_root(struct ctl_table_root *root);
|
||||
|
|
|
@ -1699,8 +1699,6 @@ static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q)
|
|||
*
|
||||
* The members of the &struct ctl_table structure are used as follows:
|
||||
*
|
||||
* ctl_name - Dead
|
||||
*
|
||||
* procname - the name of the sysctl file under /proc/sys. Set to %NULL to not
|
||||
* enter a sysctl file
|
||||
*
|
||||
|
@ -1715,8 +1713,6 @@ static void try_attach(struct ctl_table_header *p, struct ctl_table_header *q)
|
|||
*
|
||||
* proc_handler - the text handler routine (described below)
|
||||
*
|
||||
* strategy - Dead
|
||||
*
|
||||
* de - for internal use by the sysctl routines
|
||||
*
|
||||
* extra1, extra2 - extra pointers usable by the proc handler routines
|
||||
|
@ -2639,41 +2635,6 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
|
|||
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
int sysctl_data(struct ctl_table *table,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
int sysctl_string(struct ctl_table *table,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
int sysctl_intvec(struct ctl_table *table,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
int sysctl_jiffies(struct ctl_table *table,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
int sysctl_ms_jiffies(struct ctl_table *table,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
/*
|
||||
* No sense putting this after each symbol definition, twice,
|
||||
* exception granted :-)
|
||||
|
@ -2688,9 +2649,4 @@ EXPORT_SYMBOL(proc_doulongvec_minmax);
|
|||
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
|
||||
EXPORT_SYMBOL(register_sysctl_table);
|
||||
EXPORT_SYMBOL(register_sysctl_paths);
|
||||
EXPORT_SYMBOL(sysctl_intvec);
|
||||
EXPORT_SYMBOL(sysctl_jiffies);
|
||||
EXPORT_SYMBOL(sysctl_ms_jiffies);
|
||||
EXPORT_SYMBOL(sysctl_string);
|
||||
EXPORT_SYMBOL(sysctl_data);
|
||||
EXPORT_SYMBOL(unregister_sysctl_table);
|
||||
|
|
Загрузка…
Ссылка в новой задаче