treewide: Convert typedef ctl_table
Subsystems (18)
cover treewide: Convert typedef ctl_table
Most all of these have been converted in the past, these are the stragglers.
Original submission:
https://lkml.org/lkml/2013/6/13/650
trivial was cc'd previously,
\
Joe Perches (19):
arm: Convert use of typedef ctl_table to struct ctl_table
ia64: Convert use of typedef ctl_table to struct ctl_table
tile: Convert use of typedef ctl_table to struct ctl_table
cdrom: Convert use of typedef ctl_table to struct ctl_table
random: Convert use of typedef ctl_table to struct ctl_table
parport: Convert use of typedef ctl_table to struct ctl_table
scsi: Convert use of typedef ctl_table to struct ctl_table
coda: Convert use of typedef ctl_table to struct ctl_table
fscache: Convert use of typedef ctl_table to struct ctl_table
lockd: Convert use of typedef ctl_table to struct ctl_table
nfs: Convert use of typedef ctl_table to struct ctl_table
inotify: Convert use of typedef ctl_table to struct ctl_table
ntfs: Convert use of typedef ctl_table to struct ctl_table
fs: Convert use of typedef ctl_table to struct ctl_table
key: Convert use of typedef ctl_table to struct ctl_table
ipc: Convert use of typedef ctl_table to struct ctl_table
sysctl: Convert use of typedef ctl_table to struct ctl_table
mm: Convert use of typedef ctl_table to struct ctl_table
security: Convert use of typedef ctl_table to struct ctl_table
arch/arm/kernel/isa.c | 6 ++--- arch/ia64/kernel/crash.c | 4 +-- arch/ia64/kernel/perfmon.c | 6 ++--- arch/tile/kernel/proc.c | 4 +-- drivers/cdrom/cdrom.c | 10 +++---- drivers/char/random.c | 4 +-- 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 +-- include/linux/key.h | 2 +- ipc/ipc_sysctl.c | 14 +++++----- ipc/mq_sysctl.c | 12 ++++----- kernel/sysctl.c | 2 +- kernel/utsname_sysctl.c | 6 ++--- mm/page-writeback.c | 2 +- mm/page_alloc.c | 12 ++++----- security/keys/sysctl.c | 2 +- 28 files changed, 97 insertions(+), 97 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 1/19 arm: Convert use of typedef ctl_table to struct ctl_table
This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- arch/arm/kernel/isa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 2/19 ia64: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- arch/ia64/kernel/crash.c | 4 ++-- arch/ia64/kernel/perfmon.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 7/19 scsi: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- drivers/scsi/scsi_sysctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
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 },
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 4/19 cdrom: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- drivers/cdrom/cdrom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 5/19 random: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- drivers/char/random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/random.c +2 -2
@@ -1578,10 +1578,10 @@ static int proc_do_uuid(struct ctl_table *table, int write,/* * Return entropy available scaled to integral bits */ -static int proc_do_entropy (ctl_table *table,int write, +static int proc_do_entropy (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) { -ctl_table fake_table; +struct ctl_table fake_table;int entropy_count; entropy_count = *(int *)table->data >>ENTROPY_SHIFT ;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 9/19 fscache: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/fscache/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 10/19 lockd: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/lockd/svc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/lockd/svc.c +3 -3
@@ -436,7 +436,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,
@@ -490,7 +490,7 @@ static ctl_table nlm_sysctls[] = { { } }; -static ctl_table nlm_sysctl_dir[] = { +static struct ctl_table nlm_sysctl_dir[] = { { .procname ="nfs" , .mode =0555 ,
@@ -499,7 +499,7 @@ static ctl_table nlm_sysctl_dir[] = { { } }; -static ctl_table nlm_sysctl_root[] = { +static struct ctl_table nlm_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 11/19 nfs: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/nfs/nfs4sysctl.c | 6 +++--- fs/nfs/sysctl.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 14/19 fs: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/dcache.c | 2 +- fs/drop_caches.c | 2 +- fs/eventpoll.c | 2 +- fs/file_table.c | 4 ++-- fs/inode.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
fs/dcache.c +1 -1
@@ -150,7 +150,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
@@ -293,7 +293,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
@@ -77,14 +77,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/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 ();
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 13/19 ntfs: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/ntfs/sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 16/19 ipc: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- ipc/ipc_sysctl.c | 14 +++++++------- ipc/mq_sysctl.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-)
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_minmax (ctl_table *table,int write, +static int proc_ipc_callback_dointvec_minmax (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_minmax(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 +6 -6
@@ -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 (ctl_table *table,int write, +static int proc_mq_dointvec (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table mq_table;
@@ -32,7 +32,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,return proc_dointvec (&mq_table, write, buffer, lenp, ppos); } -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;
@@ -53,7 +53,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,
@@ -100,7 +100,7 @@ static ctl_table mq_sysctls[] = { {} }; -static ctl_table mq_sysctl_dir[] = { +static struct ctl_table mq_sysctl_dir[] = { { .procname ="mqueue" , .mode =0555 ,
@@ -109,7 +109,7 @@ static ctl_table mq_sysctl_dir[] = { {} }; -static ctl_table mq_sysctl_root[] = { +static struct ctl_table mq_sysctl_root[] = { { .procname ="fs" , .mode =0555 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 18/19 mm: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- mm/page-writeback.c | 2 +- mm/page_alloc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
mm/page-writeback.c +1 -1
@@ -1682,7 +1682,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 +6 -6
@@ -3351,7 +3351,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) {
@@ -5774,7 +5774,7 @@ 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, +int min_free_kbytes_sysctl_handler (struct ctl_table *table,int write,void __user *buffer,size_t *length,loff_t *ppos) {int rc;
@@ -5791,7 +5791,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;
@@ -5807,7 +5807,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;
@@ -5833,7 +5833,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);
@@ -5846,7 +5846,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;
Signature · 7 lines
1.8.1.2.459.gbcd45b4.dirty -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 19/19 security: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- security/keys/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 17/19 sysctl: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- kernel/sysctl.c | 2 +- kernel/utsname_sysctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/sysctl.c +1 -1
@@ -195,7 +195,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 =CONFIG_MAGIC_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;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 15/19 key: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- include/linux/key.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/key.h +1 -1
@@ -332,7 +332,7 @@ do { \ } while (0)#ifdef CONFIG_SYSCTL -extern ctl_table key_sysctls[]; +extern struct ctl_table key_sysctls[];#endif /* * the userspace interface
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 12/19 inotify: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/notify/inotify/inotify_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/notify/inotify/inotify_user.c +1 -1
@@ -57,7 +57,7 @@ static struct kmem_cache *inotify_inode_mark_cachep __read_mostly;static int zero; -ctl_table inotify_table[] = { +struct ctl_table inotify_table[] = { { .procname ="max_user_instances" , .data = &inotify_max_user_instances,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 8/19 coda: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- fs/coda/sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 6/19 parport: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- drivers/parport/procfs.c | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-)
drivers/parport/procfs.c +29 -29
@@ -31,7 +31,7 @@#define PARPORT_MIN_SPINTIME_VALUE 1#define PARPORT_MAX_SPINTIME_VALUE 1000 -static int do_active_device (ctl_table *table,int write, +static int do_active_device (struct ctl_table *table,int write,void __user *result,size_t *lenp,loff_t *ppos) {struct parport *port = (struct parport *)table->extra1;
@@ -68,7 +68,7 @@ static int do_active_device(ctl_table *table, int write, }#ifdef CONFIG_PARPORT_1284 -static int do_autoprobe (ctl_table *table,int write, +static int do_autoprobe (struct ctl_table *table,int write,void __user *result,size_t *lenp,loff_t *ppos) {struct parport_device_info *info = table->extra2;
@@ -110,9 +110,9 @@ static int do_autoprobe(ctl_table *table, int write, }#endif /* IEEE1284.3 support. */ -static int do_hardware_base_addr (ctl_table *table,int write, -void __user *result, -size_t *lenp,loff_t *ppos) +static int do_hardware_base_addr (struct ctl_table *table,int write, +void __user *result, +size_t *lenp,loff_t *ppos) {struct parport *port = (struct parport *)table->extra1;char buffer[20 ];
@@ -138,9 +138,9 @@ static int do_hardware_base_addr (ctl_table *table, int write,return copy_to_user (result, buffer, len) ? -EFAULT :0 ; } -static int do_hardware_irq (ctl_table *table,int write, -void __user *result, -size_t *lenp,loff_t *ppos) +static int do_hardware_irq (struct ctl_table *table,int write, +void __user *result, +size_t *lenp,loff_t *ppos) {struct parport *port = (struct parport *)table->extra1;char buffer[20 ];
@@ -166,9 +166,9 @@ static int do_hardware_irq (ctl_table *table, int write,return copy_to_user (result, buffer, len) ? -EFAULT :0 ; } -static int do_hardware_dma (ctl_table *table,int write, -void __user *result, -size_t *lenp,loff_t *ppos) +static int do_hardware_dma (struct ctl_table *table,int write, +void __user *result, +size_t *lenp,loff_t *ppos) {struct parport *port = (struct parport *)table->extra1;char buffer[20 ];
@@ -194,9 +194,9 @@ static int do_hardware_dma (ctl_table *table, int write,return copy_to_user (result, buffer, len) ? -EFAULT :0 ; } -static int do_hardware_modes (ctl_table *table,int write, -void __user *result, -size_t *lenp,loff_t *ppos) +static int do_hardware_modes (struct ctl_table *table,int write, +void __user *result, +size_t *lenp,loff_t *ppos) {struct parport *port = (struct parport *)table->extra1;char buffer[40 ];
@@ -255,11 +255,11 @@ PARPORT_MAX_SPINTIME_VALUE;struct parport_sysctl_table {struct ctl_table_header *sysctl_header; -ctl_table vars[12 ]; -ctl_table device_dir[2 ]; -ctl_table port_dir[2 ]; -ctl_table parport_dir[2 ]; -ctl_table dev_dir[2 ]; +struct ctl_table vars[12 ]; +struct ctl_table device_dir[2 ]; +struct ctl_table port_dir[2 ]; +struct ctl_table parport_dir[2 ]; +struct ctl_table dev_dir[2 ]; };static const struct parport_sysctl_table parport_sysctl_template = {
@@ -369,12 +369,12 @@ static const struct parport_sysctl_table parport_sysctl_template = {struct parport_device_sysctl_table {struct ctl_table_header *sysctl_header; -ctl_table vars[2 ]; -ctl_table device_dir[2 ]; -ctl_table devices_root_dir[2 ]; -ctl_table port_dir[2 ]; -ctl_table parport_dir[2 ]; -ctl_table dev_dir[2 ]; +struct ctl_table vars[2 ]; +struct ctl_table device_dir[2 ]; +struct ctl_table devices_root_dir[2 ]; +struct ctl_table port_dir[2 ]; +struct ctl_table parport_dir[2 ]; +struct ctl_table dev_dir[2 ]; }; static const struct parport_device_sysctl_table
@@ -422,10 +422,10 @@ parport_device_sysctl_template = {struct parport_default_sysctl_table {struct ctl_table_header *sysctl_header; -ctl_table vars[3 ]; -ctl_table default_dir[2 ]; -ctl_table parport_dir[2 ]; -ctl_table dev_dir[2 ]; +struct ctl_table vars[3 ]; +struct ctl_table default_dir[2 ]; +struct ctl_table parport_dir[2 ]; +struct ctl_table dev_dir[2 ]; }; static struct parport_default_sysctl_table
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 3/19 tile: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesThis typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
--- arch/tile/kernel/proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/tile/kernel/proc.c +2 -2
@@ -113,7 +113,7 @@ arch_initcall(proc_tile_init);* Support /proc/sys/tile directory */ -static ctl_table unaligned_subtable[] = { +static struct ctl_table unaligned_subtable[] = { { .procname ="enabled" , .data = &unaligned_fixup,
@@ -138,7 +138,7 @@ static ctl_table unaligned_subtable[] = { {} }; -static ctl_table unaligned_table[] = { +static struct ctl_table unaligned_table[] = { { .procname ="unaligned_fixup" , .mode =0555 ,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
James Morris
maintainerRe: [PATCH -next 3.16 19/19] security: Convert use of typedef ctl_table to struct ctl_table
In reply to Joe PerchesQuoted 6 lines · Joe Perches
This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>--- security/keys/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
Signature · 2 lines
James Morris <[email protected]>