treewide: Convert uses of typedef ctl_table to struct ctl_table
Subsystems (22)
PATCH 1/2 treewide: Convert uses of typedef ctl_table to struct ctl_table
The typedef is not useful, so convert all the uses.
Signed-off-by Joe Perches <[email protected]>
---
Remainder patch of what's not applied of:
https://lkml.org/lkml/2013/6/13/650
arch/arm/kernel/isa.c | 6 ++-- arch/ia64/kernel/crash.c | 4 +-- arch/ia64/kernel/perfmon.c | 6 ++-- arch/s390/appldata/appldata_base.c | 16 +++++------ arch/s390/kernel/debug.c | 4 +-- arch/s390/mm/cmm.c | 6 ++-- arch/tile/kernel/proc.c | 4 +-- drivers/cdrom/cdrom.c | 10 +++---- drivers/infiniband/core/ucma.c | 2 +- drivers/md/md.c | 6 ++-- drivers/parport/procfs.c | 58 +++++++++++++++++++------------------- drivers/scsi/scsi_sysctl.c | 6 ++-- fs/coda/sysctl.c | 4 +-- fs/dcache.c | 2 +- fs/drop_caches.c | 2 +- fs/eventpoll.c | 2 +- fs/file_table.c | 4 +-- fs/fscache/main.c | 4 +-- fs/inode.c | 2 +- fs/lockd/svc.c | 6 ++-- fs/nfs/nfs4sysctl.c | 6 ++-- fs/nfs/sysctl.c | 6 ++-- fs/notify/inotify/inotify_user.c | 2 +- fs/ntfs/sysctl.c | 4 +-- fs/ocfs2/stackglue.c | 8 +++--- include/linux/key.h | 2 +- ipc/ipc_sysctl.c | 14 ++++----- ipc/mq_sysctl.c | 10 +++---- kernel/sysctl.c | 2 +- kernel/utsname_sysctl.c | 6 ++-- mm/page-writeback.c | 2 +- mm/page_alloc.c | 15 +++++----- security/keys/sysctl.c | 2 +- 33 files changed, 118 insertions(+), 115 deletions(-)
arch/arm/kernel/isa.c +3 -3
@@ -20,7 +20,7 @@static unsigned int isa_membase, isa_portbase, isa_portshift; -static ctl_table ctl_isa_vars[4 ] = { +static struct ctl_table ctl_isa_vars[4 ] = { { .procname ="membase" , .data = &isa_membase,
@@ -44,7 +44,7 @@ static ctl_table ctl_isa_vars[4] = {static struct ctl_table_header *isa_sysctl_header; -static ctl_table ctl_isa[2 ] = { +static struct ctl_table ctl_isa[2 ] = { { .procname ="isa" , .mode =0555 ,
@@ -52,7 +52,7 @@ static ctl_table ctl_isa[2] = { }, {} }; -static ctl_table ctl_bus[2 ] = { +static struct ctl_table ctl_bus[2 ] = { { .procname ="bus" , .mode =0555 ,
arch/ia64/kernel/crash.c +2 -2
@@ -237,7 +237,7 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) } #ifdef CONFIG_SYSCTL -static ctl_table kdump_ctl_table[] = { +static struct ctl_table kdump_ctl_table[] = { { .procname = "kdump_on_init", .data = &kdump_on_init,
@@ -255,7 +255,7 @@ static ctl_table kdump_ctl_table[] = { { } }; -static ctl_table sys_table[] = { +static struct ctl_table sys_table[] = { { .procname ="kernel" , .mode =0555 ,
arch/ia64/kernel/perfmon.c +3 -3
@@ -521,7 +521,7 @@ static pmu_config_t *pmu_conf;pfm_sysctl_t pfm_sysctl;EXPORT_SYMBOL (pfm_sysctl); -static ctl_table pfm_ctl_table[]={ +static struct ctl_table pfm_ctl_table[] = { { .procname ="debug" , .data = &pfm_sysctl.debug,
@@ -552,7 +552,7 @@ static ctl_table pfm_ctl_table[]={ }, {} }; -static ctl_table pfm_sysctl_dir[] = { +static struct ctl_table pfm_sysctl_dir[] = { { .procname ="perfmon" , .mode =0555 ,
@@ -560,7 +560,7 @@ static ctl_table pfm_sysctl_dir[] = { }, {} }; -static ctl_table pfm_sysctl_root[] = { +static struct ctl_table pfm_sysctl_root[] = { { .procname ="kernel" , .mode =0555 ,
arch/s390/appldata/appldata_base.c +8 -8
@@ -48,9 +48,9 @@ static struct platform_device *appldata_pdev;* /proc entries (sysctl) */ static const char appldata_proc_name[APPLDATA_PROC_NAME_LENGTH ] ="appldata" ; -static int appldata_timer_handler (ctl_table *ctl,int write, +static int appldata_timer_handler (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos); -static int appldata_interval_handler (ctl_table *ctl,int write, +static int appldata_interval_handler (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos);
@@ -201,8 +201,8 @@ static void __appldata_vtimer_setup(int cmd)* Start/Stop timer, show status of timer (0 = not active, 1 = active) */ static int -appldata_timer_handler (ctl_table *ctl,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) +appldata_timer_handler (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {int len;char buf[2 ];
@@ -243,8 +243,8 @@ out:* current timer interval. */ static int -appldata_interval_handler (ctl_table *ctl,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) +appldata_interval_handler (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {int len, interval;char buf[16 ];
@@ -286,8 +286,8 @@ out:* monitoring (0 = not in process, 1 = in process) */ static int -appldata_generic_handler (ctl_table *ctl,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) +appldata_generic_handler (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {struct appldata_ops *ops =NULL , *tmp_ops;int rc, len, found;
arch/s390/kernel/debug.c +2 -2
@@ -889,8 +889,8 @@ static int debug_active=1;* if debug_active is already off */ static int -s390dbf_procactive (ctl_table *table,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) +s390dbf_procactive (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {if (!write || debug_stoppable || !debug_active)return proc_dointvec (table, write, buffer, lenp, ppos);
arch/s390/mm/cmm.c +4 -2
@@ -253,7 +253,8 @@ static int cmm_skip_blanks(char *cp, char **endp)static struct ctl_table cmm_table[]; -static int cmm_pages_handler (ctl_table *ctl,int write,void __user *buffer, +static int cmm_pages_handler (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {char buf[16 ], *p;
@@ -293,7 +294,8 @@ static int cmm_pages_handler(ctl_table *ctl, int write, void __user *buffer,return 0 ; } -static int cmm_timeout_handler (ctl_table *ctl,int write,void __user *buffer, +static int cmm_timeout_handler (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) {char buf[64 ], *p;
arch/tile/kernel/proc.c +2 -2
@@ -114,7 +114,7 @@ arch_initcall(proc_tile_init);*/ #ifndef __tilegx__ /* FIXME: GX: no support for unaligned access yet */ -static ctl_table unaligned_subtable[] = { +static struct ctl_table unaligned_subtable[] = { { .procname = "enabled", .data = &unaligned_fixup,
@@ -139,7 +139,7 @@ static ctl_table unaligned_subtable[] = { {} }; -static ctl_table unaligned_table[] = { +static struct ctl_table unaligned_table[] = { { .procname ="unaligned_fixup" , .mode =0555 ,
drivers/cdrom/cdrom.c +5 -5
@@ -3465,7 +3465,7 @@ static int cdrom_print_info(const char *header, int val, char *info,return 0 ; } -static int cdrom_sysctl_info (ctl_table *ctl,int write, +static int cdrom_sysctl_info (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {int pos;
@@ -3578,7 +3578,7 @@ static void cdrom_update_settings(void)mutex_unlock (&cdrom_mutex); } -static int cdrom_sysctl_handler (ctl_table *ctl,int write, +static int cdrom_sysctl_handler (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {int ret;
@@ -3604,7 +3604,7 @@ static int cdrom_sysctl_handler(ctl_table *ctl, int write, }/* Place files in /proc/sys/dev/cdrom */ -static ctl_table cdrom_table[] = { +static struct ctl_table cdrom_table[] = { { .procname ="info" , .data = &cdrom_sysctl_settings.info,
@@ -3650,7 +3650,7 @@ static ctl_table cdrom_table[] = { { } }; -static ctl_table cdrom_cdrom_table[] = { +static struct ctl_table cdrom_cdrom_table[] = { { .procname ="cdrom" , .maxlen =0 ,
@@ -3661,7 +3661,7 @@ static ctl_table cdrom_cdrom_table[] = { };/* Make sure that /proc/sys/dev is there */ -static ctl_table cdrom_root_table[] = { +static struct ctl_table cdrom_root_table[] = { { .procname ="dev" , .maxlen =0 ,
drivers/infiniband/core/ucma.c +1 -1
@@ -57,7 +57,7 @@ MODULE_LICENSE("Dual BSD/GPL");static unsigned int max_backlog =1024 ;static struct ctl_table_header *ucma_ctl_table_hdr; -static ctl_table ucma_ctl_table[] = { +static struct ctl_table ucma_ctl_table[] = { { .procname ="max_backlog" , .data = &max_backlog,
drivers/md/md.c +3 -3
@@ -112,7 +112,7 @@ static inline int speed_max(struct mddev *mddev)static struct ctl_table_header *raid_table_header; -static ctl_table raid_table[] = { +static struct ctl_table raid_table[] = { { .procname ="speed_limit_min" , .data = &sysctl_speed_limit_min,
@@ -130,7 +130,7 @@ static ctl_table raid_table[] = { { } }; -static ctl_table raid_dir_table[] = { +static struct ctl_table raid_dir_table[] = { { .procname ="raid" , .maxlen =0 ,
@@ -140,7 +140,7 @@ static ctl_table raid_dir_table[] = { { } }; -static ctl_table raid_root_table[] = { +static struct ctl_table raid_root_table[] = { { .procname ="dev" , .maxlen =0 ,
drivers/parport/procfs.c +29 -29
112 lines not on this page · raw message
drivers/scsi/scsi_sysctl.c +3 -3
@@ -12,7 +12,7 @@#include "scsi_priv.h" -static ctl_table scsi_table[] = { +static struct ctl_table scsi_table[] = { { .procname ="logging_level" , .data = &scsi_logging_level, .maxlen =sizeof (scsi_logging_level),
@@ -21,14 +21,14 @@ static ctl_table scsi_table[] = { { } }; -static ctl_table scsi_dir_table[] = { +static struct ctl_table scsi_dir_table[] = { { .procname ="scsi" , .mode =0555 , .child = scsi_table }, { } }; -static ctl_table scsi_root_table[] = { +static struct ctl_table scsi_root_table[] = { { .procname ="dev" , .mode =0555 , .child = scsi_dir_table },
fs/coda/sysctl.c +2 -2
@@ -14,7 +14,7 @@ #ifdef CONFIG_SYSCTL static struct ctl_table_header *fs_table_header; -static ctl_table coda_table[] = { +static struct ctl_table coda_table[] = { { .procname = "timeout", .data = &coda_timeout,
@@ -39,7 +39,7 @@ static ctl_table coda_table[] = { {} }; -static ctl_table fs_table[] = { +static struct ctl_table fs_table[] = { { .procname ="coda" , .mode =0555 ,
fs/dcache.c +1 -1
@@ -152,7 +152,7 @@ static long get_nr_dentry_unused(void)return sum <0 ?0 : sum; } -int proc_nr_dentry (ctl_table *table,int write,void __user *buffer, +int proc_nr_dentry (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) { dentry_stat.nr_dentry =get_nr_dentry ();
fs/drop_caches.c +1 -1
@@ -50,7 +50,7 @@ static void drop_slab(void) }while (nr_objects >10 ); } -int drop_caches_sysctl_handler (ctl_table *table,int write, +int drop_caches_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {int ret;
fs/eventpoll.c +1 -1
@@ -289,7 +289,7 @@ static LIST_HEAD(tfile_check_list);static long zero;static long long_max =LONG_MAX ; -ctl_table epoll_table[] = { +struct ctl_table epoll_table[] = { { .procname ="max_user_watches" , .data = &max_user_watches,
fs/file_table.c +2 -2
@@ -79,14 +79,14 @@ EXPORT_SYMBOL_GPL(get_max_files);* Handle nr_files sysctl */ #if defined(CONFIG_SYSCTL ) && defined(CONFIG_PROC_FS ) -int proc_nr_files (ctl_table *table,int write, +int proc_nr_files (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) { files_stat.nr_files =get_nr_files ();return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); }#else -int proc_nr_files (ctl_table *table,int write, +int proc_nr_files (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {return -ENOSYS ;
fs/fscache/main.c +2 -2
@@ -67,7 +67,7 @@ static int fscache_max_active_sysctl(struct ctl_table *table, int write,return ret; } -ctl_table fscache_sysctls[] = { +struct ctl_table fscache_sysctls[] = { { .procname ="object_max_active" , .data = &fscache_object_max_active,
@@ -87,7 +87,7 @@ ctl_table fscache_sysctls[] = { {} }; -ctl_table fscache_sysctls_root[] = { +struct ctl_table fscache_sysctls_root[] = { { .procname ="fscache" , .mode =0555 ,
fs/inode.c +1 -1
@@ -105,7 +105,7 @@ long get_nr_dirty_inodes(void)* Handle nr_inode sysctl */ #ifdef CONFIG_SYSCTL -int proc_nr_inodes (ctl_table *table,int write, +int proc_nr_inodes (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) { inodes_stat.nr_inodes =get_nr_inodes ();
fs/lockd/svc.c +3 -3
@@ -435,7 +435,7 @@ EXPORT_SYMBOL_GPL(lockd_down);* Sysctl parameters (same as module parameters, different interface). */ -static ctl_table nlm_sysctls[] = { +static struct ctl_table nlm_sysctls[] = { { .procname ="nlm_grace_period" , .data = &nlm_grace_period,
@@ -489,7 +489,7 @@ static ctl_table nlm_sysctls[] = { { } }; -static ctl_table nlm_sysctl_dir[] = { +static struct ctl_table nlm_sysctl_dir[] = { { .procname ="nfs" , .mode =0555 ,
@@ -498,7 +498,7 @@ static ctl_table nlm_sysctl_dir[] = { { } }; -static ctl_table nlm_sysctl_root[] = { +static struct ctl_table nlm_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
fs/nfs/nfs4sysctl.c +3 -3
@@ -16,7 +16,7 @@ static const int nfs_set_port_min = 0;static const int nfs_set_port_max =65535 ;static struct ctl_table_header *nfs4_callback_sysctl_table; -static ctl_table nfs4_cb_sysctls[] = { +static struct ctl_table nfs4_cb_sysctls[] = { { .procname ="nfs_callback_tcpport" , .data = &nfs_callback_set_tcpport,
@@ -36,7 +36,7 @@ static ctl_table nfs4_cb_sysctls[] = { { } }; -static ctl_table nfs4_cb_sysctl_dir[] = { +static struct ctl_table nfs4_cb_sysctl_dir[] = { { .procname ="nfs" , .mode =0555 ,
@@ -45,7 +45,7 @@ static ctl_table nfs4_cb_sysctl_dir[] = { { } }; -static ctl_table nfs4_cb_sysctl_root[] = { +static struct ctl_table nfs4_cb_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
fs/nfs/sysctl.c +3 -3
@@ -13,7 +13,7 @@static struct ctl_table_header *nfs_callback_sysctl_table; -static ctl_table nfs_cb_sysctls[] = { +static struct ctl_table nfs_cb_sysctls[] = { { .procname ="nfs_mountpoint_timeout" , .data = &nfs_mountpoint_expiry_timeout,
@@ -31,7 +31,7 @@ static ctl_table nfs_cb_sysctls[] = { { } }; -static ctl_table nfs_cb_sysctl_dir[] = { +static struct ctl_table nfs_cb_sysctl_dir[] = { { .procname ="nfs" , .mode =0555 ,
@@ -40,7 +40,7 @@ static ctl_table nfs_cb_sysctl_dir[] = { { } }; -static ctl_table nfs_cb_sysctl_root[] = { +static struct ctl_table nfs_cb_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
fs/notify/inotify/inotify_user.c +1 -1
@@ -58,7 +58,7 @@ struct kmem_cache *event_priv_cachep __read_mostly;static int zero; -ctl_table inotify_table[] = { +struct ctl_table inotify_table[] = { { .procname ="max_user_instances" , .data = &inotify_max_user_instances,
fs/ntfs/sysctl.c +2 -2
@@ -34,7 +34,7 @@#include "debug.h" /* Definition of the ntfs sysctl. */ -static ctl_table ntfs_sysctls[] = { +static struct ctl_table ntfs_sysctls[] = { { .procname ="ntfs-debug" , .data = &debug_msgs,/* Data pointer and size. */
@@ -46,7 +46,7 @@ static ctl_table ntfs_sysctls[] = { };/* Define the parent directory /proc/sys/fs. */ -static ctl_table sysctls_root[] = { +static struct ctl_table sysctls_root[] = { { .procname ="fs" , .mode =0555 ,
fs/ocfs2/stackglue.c +4 -4
@@ -643,7 +643,7 @@ error:#define FS_OCFS2_NM 1 -static ctl_table ocfs2_nm_table[] = { +static struct ctl_table ocfs2_nm_table[] = { { .procname ="hb_ctl_path" , .data = ocfs2_hb_ctl_path,
@@ -654,7 +654,7 @@ static ctl_table ocfs2_nm_table[] = { { } }; -static ctl_table ocfs2_mod_table[] = { +static struct ctl_table ocfs2_mod_table[] = { { .procname ="nm" , .data =NULL ,
@@ -665,7 +665,7 @@ static ctl_table ocfs2_mod_table[] = { { } }; -static ctl_table ocfs2_kern_table[] = { +static struct ctl_table ocfs2_kern_table[] = { { .procname ="ocfs2" , .data =NULL ,
@@ -676,7 +676,7 @@ static ctl_table ocfs2_kern_table[] = { { } }; -static ctl_table ocfs2_root_table[] = { +static struct ctl_table ocfs2_root_table[] = { { .procname ="fs" , .data =NULL ,
include/linux/key.h +1 -1
@@ -310,7 +310,7 @@ do { \ } while (0)#ifdef CONFIG_SYSCTL -extern ctl_table key_sysctls[]; +extern struct ctl_table key_sysctls[];#endif /* * the userspace interface
ipc/ipc_sysctl.c +7 -7
@@ -18,7 +18,7 @@#include <linux/msg.h> #include "util.h" -static void *get_ipc (ctl_table *table) +static void *get_ipc (struct ctl_table *table) {char *which = table->data;struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@@ -27,7 +27,7 @@ static void *get_ipc(ctl_table *table) }#ifdef CONFIG_PROC_SYSCTL -static int proc_ipc_dointvec (ctl_table *table,int write, +static int proc_ipc_dointvec (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
@@ -38,7 +38,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,return proc_dointvec (&ipc_table, write, buffer, lenp, ppos); } -static int proc_ipc_dointvec_minmax (ctl_table *table,int write, +static int proc_ipc_dointvec_minmax (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
@@ -49,7 +49,7 @@ static int proc_ipc_dointvec_minmax(ctl_table *table, int write,return proc_dointvec_minmax (&ipc_table, write, buffer, lenp, ppos); } -static int proc_ipc_dointvec_minmax_orphans (ctl_table *table,int write, +static int proc_ipc_dointvec_minmax_orphans (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ipc_namespace *ns = current->nsproxy->ipc_ns;
@@ -62,7 +62,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,return err; } -static int proc_ipc_callback_dointvec (ctl_table *table,int write, +static int proc_ipc_callback_dointvec (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
@@ -85,7 +85,7 @@ static int proc_ipc_callback_dointvec(ctl_table *table, int write,return rc; } -static int proc_ipc_doulongvec_minmax (ctl_table *table,int write, +static int proc_ipc_doulongvec_minmax (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
@@ -119,7 +119,7 @@ static void ipc_auto_callback(int val) } } -static int proc_ipcauto_dointvec_minmax (ctl_table *table,int write, +static int proc_ipcauto_dointvec_minmax (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table ipc_table;
ipc/mq_sysctl.c +5 -5
@@ -14,7 +14,7 @@#include <linux/sysctl.h> #ifdef CONFIG_PROC_SYSCTL -static void *get_mq (ctl_table *table) +static void *get_mq (struct ctl_table *table) {char *which = table->data;struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@@ -22,7 +22,7 @@ static void *get_mq(ctl_table *table)return which; } -static int proc_mq_dointvec_minmax (ctl_table *table,int write, +static int proc_mq_dointvec_minmax (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table mq_table;
@@ -45,7 +45,7 @@ static int msg_max_limit_max = HARD_MSGMAX;static int msg_maxsize_limit_min =MIN_MSGSIZEMAX ;static int msg_maxsize_limit_max =HARD_MSGSIZEMAX ; -static ctl_table mq_sysctls[] = { +static struct ctl_table mq_sysctls[] = { { .procname ="queues_max" , .data = &init_ipc_ns.mq_queues_max,
@@ -94,7 +94,7 @@ static ctl_table mq_sysctls[] = { {} }; -static ctl_table mq_sysctl_dir[] = { +static struct ctl_table mq_sysctl_dir[] = { { .procname ="mqueue" , .mode =0555 ,
@@ -103,7 +103,7 @@ static ctl_table mq_sysctl_dir[] = { {} }; -static ctl_table mq_sysctl_root[] = { +static struct ctl_table mq_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
kernel/sysctl.c +1 -1
@@ -192,7 +192,7 @@ static int proc_dostring_coredump(struct ctl_table *table, int write,/* Note: sysrq code uses it's own private copy */ static int __sysrq_enabled =SYSRQ_DEFAULT_ENABLE ; -static int sysrq_sysctl_handler (ctl_table *table,int write, +static int sysrq_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {
kernel/utsname_sysctl.c +3 -3
@@ -17,7 +17,7 @@#ifdef CONFIG_PROC_SYSCTL -static void *get_uts (ctl_table *table,int write) +static void *get_uts (struct ctl_table *table,int write) {char *which = table->data;struct uts_namespace *uts_ns;
@@ -32,7 +32,7 @@ static void *get_uts(ctl_table *table, int write)return which; } -static void put_uts (ctl_table *table,int write,void *which) +static void put_uts (struct ctl_table *table,int write,void *which) {if (!write)up_read (&uts_sem);
@@ -44,7 +44,7 @@ static void put_uts(ctl_table *table, int write, void *which)* Special case of dostring for the UTS structure. This has locks * to observe. Should this be in kernel/sys.c ???? */ -static int proc_do_uts_string (ctl_table *table,int write, +static int proc_do_uts_string (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table uts_table;
mm/page-writeback.c +1 -1
@@ -1546,7 +1546,7 @@ void throttle_vm_writeout(gfp_t gfp_mask)/* * sysctl handler for /proc/sys/vm/dirty_writeback_centisecs */ -int dirty_writeback_centisecs_handler (ctl_table *table,int write, +int dirty_writeback_centisecs_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {proc_dointvec (table, write, buffer, length, ppos);
mm/page_alloc.c +8 -7
@@ -3243,7 +3243,7 @@ early_param("numa_zonelist_order", setup_numa_zonelist_order);/* * sysctl handler for numa_zonelist_order */ -int numa_zonelist_order_handler (ctl_table *table,int write, +int numa_zonelist_order_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {
@@ -5618,8 +5618,9 @@ module_init(init_per_zone_wmark_min)* that we can call two helper functions whenever min_free_kbytes * changes. */ -int min_free_kbytes_sysctl_handler (ctl_table *table,int write, -void __user *buffer,size_t *length,loff_t *ppos) +int min_free_kbytes_sysctl_handler (struct ctl_table *table,int write, +void __user *buffer, +size_t *length,loff_t *ppos) {proc_dointvec (table, write, buffer, length, ppos);if (write) {
@@ -5630,7 +5631,7 @@ int min_free_kbytes_sysctl_handler(ctl_table *table, int write, }#ifdef CONFIG_NUMA -int sysctl_min_unmapped_ratio_sysctl_handler (ctl_table *table,int write, +int sysctl_min_unmapped_ratio_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {struct zone *zone;
@@ -5646,7 +5647,7 @@ int sysctl_min_unmapped_ratio_sysctl_handler(ctl_table *table, int write,return 0 ; } -int sysctl_min_slab_ratio_sysctl_handler (ctl_table *table,int write, +int sysctl_min_slab_ratio_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {struct zone *zone;
@@ -5672,7 +5673,7 @@ int sysctl_min_slab_ratio_sysctl_handler(ctl_table *table, int write,* minimum watermarks. The lowmem reserve ratio can only make sense * if in function of the boot time zone sizes. */ -int lowmem_reserve_ratio_sysctl_handler (ctl_table *table,int write, +int lowmem_reserve_ratio_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {proc_dointvec_minmax (table, write, buffer, length, ppos);
@@ -5685,7 +5686,7 @@ int lowmem_reserve_ratio_sysctl_handler(ctl_table *table, int write,* cpu. It is the fraction of total pages in each zone that a hot per cpu pagelist * can have before it gets flushed back to buddy allocator. */ -int percpu_pagelist_fraction_sysctl_handler (ctl_table *table,int write, +int percpu_pagelist_fraction_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {struct zone *zone;
security/keys/sysctl.c +1 -1
@@ -15,7 +15,7 @@static const int zero, one =1 , max =INT_MAX ; -ctl_table key_sysctls[] = { +struct ctl_table key_sysctls[] = { { .procname ="maxkeys" , .data = &key_quota_maxkeys,
PATCH 2/2 treewide: Remove typedef ctl_table
Remove this now unused typedef.
Signed-off-by Joe Perches <[email protected]>
--- include/linux/sysctl.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/sysctl.h +0 -2
@@ -34,8 +34,6 @@ struct ctl_table_root;struct ctl_table_header ;struct ctl_dir ; -typedef struct ctl_table ctl_table ; -typedef int proc_handler (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos);