Remove uses of typedef ctl_table

PATCH Applied Joe Perches 9 participants 46 messages Jun 14, 2013 – Jun 21, 2013

Subsystems (35)

Networking Network drivers Memory management Arm (32-bit) +31 more subsystems

lore

Share & tools

lore

Joe Perches

author

2013-06-14 02:37 UTC #0 lore raw

cover Remove uses of typedef ctl_table

It's clearer to use struct ctl_table instead

Joe Perches (33):
arm: kernel: isa: Convert use of typedef ctl_table to struct ctl_table
frv: Convert use of typedef ctl_table to struct ctl_table
ia64: crash: Convert use of typedef ctl_table to struct ctl_table
mips: lasat: sysctl: Convert use of typedef ctl_table to struct ctl_table
powerpc: idle: Convert use of typedef ctl_table to struct ctl_table
s390: Convert use of typedef ctl_table to struct ctl_table
tile: proc: Convert use of typedef ctl_table to struct ctl_table
x86: vdso: Convert use of typedef ctl_table to struct ctl_table
cdrom: Convert use of typedef ctl_table to struct ctl_table
char: Convert use of typedef ctl_table to struct ctl_table
infiniband: Convert use of typedef ctl_table to struct ctl_table
macintosh: Convert use of typedef ctl_table to struct ctl_table
md: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
parport: Convert use of typedef ctl_table to struct ctl_table
scsi_sysctl: 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
ocfs2: Convert use of typedef ctl_table to struct ctl_table
quota: Convert use of typedef ctl_table to struct ctl_table
xfs: 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
ipv6: Convert use of typedef ctl_table to struct ctl_table
ndisc: 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: keys: Convert use of typedef ctl_table to struct ctl_table

 arch/arm/kernel/isa.c              |  6 ++--
 arch/frv/kernel/pm.c               |  8 +++---
 arch/frv/kernel/sysctl.c           |  4 +--
 arch/ia64/kernel/crash.c           |  4 +--
 arch/ia64/kernel/perfmon.c         |  6 ++--
 arch/mips/lasat/sysctl.c           | 14 ++++-----
 arch/powerpc/kernel/idle.c         |  4 +--
 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 +--
 arch/x86/vdso/vdso32-setup.c       |  4 +--
 drivers/cdrom/cdrom.c              | 10 +++----
 drivers/char/hpet.c                |  6 ++--
 drivers/char/ipmi/ipmi_poweroff.c  |  6 ++--
 drivers/char/random.c              |  8 +++---
 drivers/char/rtc.c                 |  6 ++--
 drivers/infiniband/core/ucma.c     |  2 +-
 drivers/macintosh/mac_hid.c        |  8 +++---
 drivers/md/md.c                    |  6 ++--
 drivers/misc/sgi-xp/xpc_main.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 +++---
 fs/quota/dquot.c                   |  6 ++--
 fs/xfs/xfs_sysctl.c                | 26 ++++++++---------
 include/linux/key.h                |  2 +-
 include/net/ipv6.h                 |  4 +--
 include/net/ndisc.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 +-
 48 files changed, 174 insertions(+), 171 deletions(-)

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:37 UTC #1 lore raw

PATCH 1/33 arm: kernel: isa: 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

index 3464859..9d1cf71 100644
@@ -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

Joe Perches

author

2013-06-14 02:38 UTC #2 lore raw

PATCH 2/33 frv: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 arch/frv/kernel/pm.c     | 8 ++++----
 arch/frv/kernel/sysctl.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

arch/frv/kernel/pm.c +4 -4

index 0b57992..ac767d9 100644
@@ -150,7 +150,7 @@ static int user_atoi(char __user *ubuf, size_t len)
 /*
  * Send us to sleep.
  */
-static int sysctl_pm_do_suspend(ctl_table *ctl, int write,
+static int sysctl_pm_do_suspend(struct ctl_table *ctl, int write,
 				void __user *buffer, size_t *lenp, loff_t *fpos)
 {
 	int mode;

@@ -197,7 +197,7 @@ static int try_set_cmode(int new_cmode)
 }
 
 
-static int cmode_procctl(ctl_table *ctl, int write,
+static int cmode_procctl(struct ctl_table *ctl, int write,
 			 void __user *buffer, size_t *lenp, loff_t *fpos)
 {
 	int new_cmode;

@@ -269,7 +269,7 @@ static int try_set_cm(int new_cm)
 	return 0;
 }
 
-static int p0_procctl(ctl_table *ctl, int write,
+static int p0_procctl(struct ctl_table *ctl, int write,
 		      void __user *buffer, size_t *lenp, loff_t *fpos)
 {
 	int new_p0;

@@ -282,7 +282,7 @@ static int p0_procctl(ctl_table *ctl, int write,
 	return try_set_p0(new_p0)?:*lenp;
 }
 
-static int cm_procctl(ctl_table *ctl, int write,
+static int cm_procctl(struct ctl_table *ctl, int write,
 		      void __user *buffer, size_t *lenp, loff_t *fpos)
 {
 	int new_cm;

arch/frv/kernel/sysctl.c +2 -2

index 6c155d6..f4dfae2 100644
@@ -46,7 +46,7 @@ static void frv_change_dcache_mode(unsigned long newmode)
 /*
  * handle requests to dynamically switch the write caching mode delivered by /proc
  */
-static int procctl_frv_cachemode(ctl_table *table, int write,
+static int procctl_frv_cachemode(struct ctl_table *table, int write,
 				 void __user *buffer, size_t *lenp,
 				 loff_t *ppos)
 {

@@ -121,7 +121,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write,
  * permit the mm_struct the nominated process is using have its MMU context ID pinned
  */
 #ifdef CONFIG_MMU
-static int procctl_frv_pin_cxnr(ctl_table *table, int write,
+static int procctl_frv_pin_cxnr(struct ctl_table *table, int write,
 				void __user *buffer, size_t *lenp,
 				loff_t *ppos)
 {

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

David Howells

maintainer

2013-06-14 08:57 UTC #3 lore raw

Re: [Trivial PATCH 02/33] frv: Convert use of typedef ctl_table to struct ctl_table

These look okay. Feel free to add my Acked-by. I presume they can't become const also?

David

Joe Perches

author

2013-06-14 02:37 UTC #4 lore raw

PATCH 3/33 ia64: crash: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index b942f40..2955f35 100644
@@ -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

index 5a9ff1c..81c962b 100644
@@ -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

Joe Perches

author

2013-06-14 02:38 UTC #5 lore raw

PATCH 4/33 mips: lasat: sysctl: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 arch/mips/lasat/sysctl.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

arch/mips/lasat/sysctl.c +7 -7

index f27694f..3b7f65c 100644
@@ -39,7 +39,7 @@
 
 
 /* And the same for proc */
-int proc_dolasatstring(ctl_table *table, int write,
+int proc_dolasatstring(struct ctl_table *table, int write,
 		       void *buffer, size_t *lenp, loff_t *ppos)
 {
 	int r;

@@ -54,7 +54,7 @@ int proc_dolasatstring(ctl_table *table, int write,
 }
 
 /* proc function to write EEPROM after changing int entry */
-int proc_dolasatint(ctl_table *table, int write,
+int proc_dolasatint(struct ctl_table *table, int write,
 		       void *buffer, size_t *lenp, loff_t *ppos)
 {
 	int r;

@@ -72,7 +72,7 @@ int proc_dolasatint(ctl_table *table, int write,
 static int rtctmp;
 
 /* proc function to read/write RealTime Clock */
-int proc_dolasatrtc(ctl_table *table, int write,
+int proc_dolasatrtc(struct ctl_table *table, int write,
 		       void *buffer, size_t *lenp, loff_t *ppos)
 {
 	struct timespec ts;

@@ -97,7 +97,7 @@ int proc_dolasatrtc(ctl_table *table, int write,
 #endif
 
 #ifdef CONFIG_INET
-int proc_lasat_ip(ctl_table *table, int write,
+int proc_lasat_ip(struct ctl_table *table, int write,
 		       void *buffer, size_t *lenp, loff_t *ppos)
 {
 	unsigned int ip;

@@ -157,7 +157,7 @@ int proc_lasat_ip(ctl_table *table, int write,
 }
 #endif
 
-int proc_lasat_prid(ctl_table *table, int write,
+int proc_lasat_prid(struct ctl_table *table, int write,
 		       void *buffer, size_t *lenp, loff_t *ppos)
 {
 	int r;

@@ -176,7 +176,7 @@ int proc_lasat_prid(ctl_table *table, int write,
 
 extern int lasat_boot_to_service;
 
-static ctl_table lasat_table[] = {
+static struct ctl_table lasat_table[] = {
 	{
 		.procname	= "cpu-hz",
 		.data		= &lasat_board_info.li_cpu_hz,

@@ -262,7 +262,7 @@ static ctl_table lasat_table[] = {
 	{}
 };
 
-static ctl_table lasat_root_table[] = {
+static struct ctl_table lasat_root_table[] = {
 	{
 		.procname	= "lasat",
 		.mode		=  0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:38 UTC #6 lore raw

PATCH 5/33 powerpc: idle: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 arch/powerpc/kernel/idle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/kernel/idle.c +2 -2

index 939ea7e..d7216c9 100644
@@ -85,7 +85,7 @@ int powersave_nap;
 /*
  * Register the sysctl to set/clear powersave_nap.
  */
-static ctl_table powersave_nap_ctl_table[]={
+static struct ctl_table powersave_nap_ctl_table[] = {
 	{
 		.procname	= "powersave-nap",
 		.data		= &powersave_nap,

@@ -95,7 +95,7 @@ static ctl_table powersave_nap_ctl_table[]={
 	},
 	{}
 };
-static ctl_table powersave_nap_sysctl_root[] = {
+static struct ctl_table powersave_nap_sysctl_root[] = {
 	{
 		.procname	= "kernel",
 		.mode		= 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:37 UTC #7 lore raw

PATCH 6/33 s390: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 arch/s390/appldata/appldata_base.c | 16 ++++++++--------
 arch/s390/kernel/debug.c           |  4 ++--
 arch/s390/mm/cmm.c                 |  6 ++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

arch/s390/appldata/appldata_base.c +8 -8

index 87a2209..c0ef020a 100644
@@ -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

index f1279dc..fc5672f 100644
@@ -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

index 9d84a1f..0caf085 100644
@@ -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;

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:39 UTC #8 lore raw

PATCH 7/33 tile: proc: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index dafc447..6570813 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:39 UTC #9 lore raw

PATCH 8/33 x86: vdso: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 arch/x86/vdso/vdso32-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/vdso/vdso32-setup.c +2 -2

index 0faad64..d6bfb87 100644
@@ -372,7 +372,7 @@ subsys_initcall(sysenter_setup);
 /* Register vsyscall32 into the ABI table */
 #include <linux/sysctl.h>
 
-static ctl_table abi_table2[] = {
+static struct ctl_table abi_table2[] = {
 	{
 		.procname	= "vsyscall32",
 		.data		= &sysctl_vsyscall32,

@@ -383,7 +383,7 @@ static ctl_table abi_table2[] = {
 	{}
 };
 
-static ctl_table abi_root_table2[] = {
+static struct ctl_table abi_root_table2[] = {
 	{
 		.procname = "abi",
 		.mode = 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

tip-bot for Joe Perches

merge bot

2013-06-19 18:43 UTC #10 lore raw

[tip:x86/asm] x86/vdso: Convert use of typedef ctl_table to struct ctl_table

x86/vdso: Convert use of typedef ctl_table to struct ctl_table

Commit-ID:  f07d91ede6f346cbe31bb814cefe2584940b96f3
Gitweb:     http://git.kernel.org/tip/f07d91ede6f346cbe31bb814cefe2584940b96f3
Author:     Joe Perches <[email protected]>
AuthorDate: Thu, 13 Jun 2013 19:37:33 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 19 Jun 2013 15:06:09 +0200

x86/vdso: 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]>

Cc Jiri Kosina <[email protected]>

Link http://lkml.kernel.org/r/a756fa0060e8eea25e8c1863c2764e86c2823617.1371177118.git.joe@perches.com open here

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/vdso/vdso32-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/vdso/vdso32-setup.c +2 -2

index 0faad64..d6bfb87 100644
@@ -372,7 +372,7 @@ subsys_initcall(sysenter_setup);
 /* Register vsyscall32 into the ABI table */
 #include <linux/sysctl.h>
 
-static ctl_table abi_table2[] = {
+static struct ctl_table abi_table2[] = {
 	{
 		.procname	= "vsyscall32",
 		.data		= &sysctl_vsyscall32,

@@ -383,7 +383,7 @@ static ctl_table abi_table2[] = {
 	{}
 };
 
-static ctl_table abi_root_table2[] = {
+static struct ctl_table abi_root_table2[] = {
 	{
 		.procname = "abi",
 		.mode = 0555,

H. Peter Anvin

reviewer

2013-06-19 18:47 UTC #11 lore raw

Re: [tip:x86/asm] x86/vdso: Convert use of typedef ctl_table to struct ctl_table

Shouldn't this actually remove the typedef?

-hpa

Quoted 42 lines · tip-bot for Joe Perches

Commit-ID:  f07d91ede6f346cbe31bb814cefe2584940b96f3
Gitweb:     http://git.kernel.org/tip/f07d91ede6f346cbe31bb814cefe2584940b96f3
Author:     Joe Perches <[email protected]>
AuthorDate: Thu, 13 Jun 2013 19:37:33 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 19 Jun 2013 15:06:09 +0200

x86/vdso: 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]>

Cc Jiri Kosina <[email protected]>

Link http://lkml.kernel.org/r/a756fa0060e8eea25e8c1863c2764e86c2823617.1371177118.git.joe@perches.com open here

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/vdso/vdso32-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/vdso/vdso32-setup.c +2 -2

index 0faad64..d6bfb87 100644
@@ -372,7 +372,7 @@ subsys_initcall(sysenter_setup);
 /* Register vsyscall32 into the ABI table */
 #include <linux/sysctl.h>
 
-static ctl_table abi_table2[] = {
+static struct ctl_table abi_table2[] = {
 	{
 		.procname	= "vsyscall32",
 		.data		= &sysctl_vsyscall32,

@@ -383,7 +383,7 @@ static ctl_table abi_table2[] = {
 	{}
 };
 
-static ctl_table abi_root_table2[] = {
+static struct ctl_table abi_root_table2[] = {
 	{
 		.procname = "abi",
 		.mode = 0555,

Joe Perches

author

2013-06-19 19:05 UTC #12 lore raw

Re: [tip:x86/asm] x86/vdso: Convert use of typedef ctl_table to struct ctl_table

Quoted 1 line · H. Peter Anvin

Shouldn't this actually remove the typedef?

Much later, yes.

The uses are ~50:50 for the typedef vs struct ctl_table.

It's used all over the tree and it likely won't be removed for several months after Jiri lets it filter through the various maintainers to pick up directly.

I'll resend the bits that haven't been picked up in a few months along with the typedef removal.

Joe Perches

author

2013-06-14 02:39 UTC #13 lore raw

PATCH 9/33 cdrom: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 8a3aff7..d49a76f 100644
@@ -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

Joe Perches

author

2013-06-14 02:39 UTC #14 lore raw

PATCH 10/33 char: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/char/hpet.c               | 6 +++---
 drivers/char/ipmi/ipmi_poweroff.c | 6 +++---
 drivers/char/random.c             | 8 ++++----
 drivers/char/rtc.c                | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

drivers/char/hpet.c +3 -3

index d784650..448ce5e 100644
@@ -725,7 +725,7 @@ static int hpet_is_known(struct hpet_data *hdp)
 	return 0;
 }
 
-static ctl_table hpet_table[] = {
+static struct ctl_table hpet_table[] = {
 	{
 	 .procname = "max-user-freq",
 	 .data = &hpet_max_freq,

@@ -736,7 +736,7 @@ static ctl_table hpet_table[] = {
 	{}
 };
 
-static ctl_table hpet_root[] = {
+static struct ctl_table hpet_root[] = {
 	{
 	 .procname = "hpet",
 	 .maxlen = 0,

@@ -746,7 +746,7 @@ static ctl_table hpet_root[] = {
 	{}
 };
 
-static ctl_table dev_root[] = {
+static struct ctl_table dev_root[] = {
 	{
 	 .procname = "dev",
 	 .maxlen = 0,

drivers/char/ipmi/ipmi_poweroff.c +3 -3

index 2efa176..9f2e3be 100644
@@ -659,7 +659,7 @@ static struct ipmi_smi_watcher smi_watcher = {
 #ifdef CONFIG_PROC_FS
 #include <linux/sysctl.h>
 
-static ctl_table ipmi_table[] = {
+static struct ctl_table ipmi_table[] = {
 	{ .procname	= "poweroff_powercycle",
 	  .data		= &poweroff_powercycle,
 	  .maxlen	= sizeof(poweroff_powercycle),

@@ -668,14 +668,14 @@ static ctl_table ipmi_table[] = {
 	{ }
 };
 
-static ctl_table ipmi_dir_table[] = {
+static struct ctl_table ipmi_dir_table[] = {
 	{ .procname	= "ipmi",
 	  .mode		= 0555,
 	  .child	= ipmi_table },
 	{ }
 };
 
-static ctl_table ipmi_root_table[] = {
+static struct ctl_table ipmi_root_table[] = {
 	{ .procname	= "dev",
 	  .mode		= 0555,
 	  .child	= ipmi_dir_table },

drivers/char/random.c +4 -4

index 35487e8..0d91fe5 100644
@@ -1381,10 +1381,10 @@ static char sysctl_bootid[16];
  * as an ASCII string in the standard UUID format.  If accesses via the
  * sysctl system call, it is returned as 16 bytes of binary data.
  */
-static int proc_do_uuid(ctl_table *table, int write,
+static int proc_do_uuid(struct ctl_table *table, int write,
 			void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-	ctl_table fake_table;
+	struct ctl_table fake_table;
 	unsigned char buf[64], tmp_uuid[16], *uuid;
 
 	uuid = table->data;

@@ -1409,8 +1409,8 @@ static int proc_do_uuid(ctl_table *table, int write,
 }
 
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
-extern ctl_table random_table[];
-ctl_table random_table[] = {
+extern struct ctl_table random_table[];
+struct ctl_table random_table[] = {
 	{
 		.procname	= "poolsize",
 		.data		= &sysctl_poolsize,

drivers/char/rtc.c +3 -3

index 91470fd..c0cbbd4 100644
@@ -280,7 +280,7 @@ static irqreturn_t rtc_interrupt(int irq, void *dev_id)
 /*
  * sysctl-tuning infrastructure.
  */
-static ctl_table rtc_table[] = {
+static struct ctl_table rtc_table[] = {
 	{
 		.procname	= "max-user-freq",
 		.data		= &rtc_max_user_freq,

@@ -291,7 +291,7 @@ static ctl_table rtc_table[] = {
 	{ }
 };
 
-static ctl_table rtc_root[] = {
+static struct ctl_table rtc_root[] = {
 	{
 		.procname	= "rtc",
 		.mode		= 0555,

@@ -300,7 +300,7 @@ static ctl_table rtc_root[] = {
 	{ }
 };
 
-static ctl_table dev_root[] = {
+static struct ctl_table dev_root[] = {
 	{
 		.procname	= "dev",
 		.mode		= 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:37 UTC #15 lore raw

PATCH 11/33 infiniband: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/infiniband/core/ucma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/core/ucma.c +1 -1

index 5ca44cd..9416280 100644
@@ -55,7 +55,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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:40 UTC #16 lore raw

PATCH 12/33 macintosh: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/macintosh/mac_hid.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/macintosh/mac_hid.c +4 -4

index 6a82388..80d30e8 100644
@@ -181,7 +181,7 @@ static void mac_hid_stop_emulation(void)
 	mac_hid_destroy_emumouse();
 }
 
-static int mac_hid_toggle_emumouse(ctl_table *table, int write,
+static int mac_hid_toggle_emumouse(struct ctl_table *table, int write,
 				   void __user *buffer, size_t *lenp,
 				   loff_t *ppos)
 {

@@ -214,7 +214,7 @@ static int mac_hid_toggle_emumouse(ctl_table *table, int write,
 }
 
 /* file(s) in /proc/sys/dev/mac_hid */
-static ctl_table mac_hid_files[] = {
+static struct ctl_table mac_hid_files[] = {
 	{
 		.procname	= "mouse_button_emulation",
 		.data		= &mouse_emulate_buttons,

@@ -240,7 +240,7 @@ static ctl_table mac_hid_files[] = {
 };
 
 /* dir in /proc/sys/dev */
-static ctl_table mac_hid_dir[] = {
+static struct ctl_table mac_hid_dir[] = {
 	{
 		.procname	= "mac_hid",
 		.maxlen		= 0,

@@ -251,7 +251,7 @@ static ctl_table mac_hid_dir[] = {
 };
 
 /* /proc/sys/dev itself, in case that is not there yet */
-static ctl_table mac_hid_root_dir[] = {
+static struct ctl_table mac_hid_root_dir[] = {
 	{
 		.procname	= "dev",
 		.maxlen		= 0,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:37 UTC #17 lore raw

PATCH 13/33 md: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/md/md.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/md/md.c +3 -3

index 9b82377..f7edaf9 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:40 UTC #18 lore raw

PATCH 14/33 sgi: xpc: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/misc/sgi-xp/xpc_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/misc/sgi-xp/xpc_main.c +3 -3

index d971817..82dc574 100644
@@ -92,7 +92,7 @@ int xpc_disengage_timelimit = XPC_DISENGAGE_DEFAULT_TIMELIMIT;
 static int xpc_disengage_min_timelimit;	/* = 0 */
 static int xpc_disengage_max_timelimit = 120;
 
-static ctl_table xpc_sys_xpc_hb_dir[] = {
+static struct ctl_table xpc_sys_xpc_hb_dir[] = {
 	{
 	 .procname = "hb_interval",
 	 .data = &xpc_hb_interval,

@@ -111,7 +111,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
 	 .extra2 = &xpc_hb_check_max_interval},
 	{}
 };
-static ctl_table xpc_sys_xpc_dir[] = {
+static struct ctl_table xpc_sys_xpc_dir[] = {
 	{
 	 .procname = "hb",
 	 .mode = 0555,

@@ -126,7 +126,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
 	 .extra2 = &xpc_disengage_max_timelimit},
 	{}
 };
-static ctl_table xpc_sys_dir[] = {
+static struct ctl_table xpc_sys_dir[] = {
 	{
 	 .procname = "xpc",
 	 .mode = 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Robin Holt

Acked-by on v1 14/33

2013-06-14 02:53 UTC #19 lore raw

Re: [Trivial PATCH 14/33] sgi: xpc: Convert use of typedef ctl_table to struct ctl_table

Quoted 3 lines · Joe Perches

This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>

Acked-by Robin Holt <[email protected]>

Quoted 37 lines

---
 drivers/misc/sgi-xp/xpc_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/misc/sgi-xp/xpc_main.c +3 -3

index d971817..82dc574 100644
@@ -92,7 +92,7 @@ int xpc_disengage_timelimit = XPC_DISENGAGE_DEFAULT_TIMELIMIT;
 static int xpc_disengage_min_timelimit;	/* = 0 */
 static int xpc_disengage_max_timelimit = 120;
 
-static ctl_table xpc_sys_xpc_hb_dir[] = {
+static struct ctl_table xpc_sys_xpc_hb_dir[] = {
 	{
 	 .procname = "hb_interval",
 	 .data = &xpc_hb_interval,

@@ -111,7 +111,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
 	 .extra2 = &xpc_hb_check_max_interval},
 	{}
 };
-static ctl_table xpc_sys_xpc_dir[] = {
+static struct ctl_table xpc_sys_xpc_dir[] = {
 	{
 	 .procname = "hb",
 	 .mode = 0555,

@@ -126,7 +126,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
 	 .extra2 = &xpc_disengage_max_timelimit},
 	{}
 };
-static ctl_table xpc_sys_dir[] = {
+static struct ctl_table xpc_sys_dir[] = {
 	{
 	 .procname = "xpc",
 	 .mode = 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:40 UTC #20 lore raw

PATCH 15/33 parport: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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~~

index 92ed045..3b47080 100644
@@ -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

Joe Perches

author

2013-06-14 02:37 UTC #21 lore raw

PATCH 16/33 scsi_sysctl: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 2b6b93f..546f162 100644
@@ -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

Joe Perches

author

2013-06-14 02:45 UTC #22 lore raw

PATCH 17/33 coda: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index af56ad5..34218a8 100644
@@ -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

Joe Perches

author

2013-06-14 02:40 UTC #23 lore raw

PATCH 18/33 fscache: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 7c27907..5b2c174 100644
@@ -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

Joe Perches

author

2013-06-14 02:41 UTC #24 lore raw

PATCH 19/33 lockd: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index a2aa97d..7df25d7 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:41 UTC #25 lore raw

PATCH 20/33 nfs: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 2628d92..b6ebe7e 100644
@@ -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

index 6b3f253..bb6ed81 100644
@@ -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

Joe Perches

author

2013-06-14 02:41 UTC #26 lore raw

PATCH 21/33 inotify: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 959815c..3e03d81 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:44 UTC #27 lore raw

PATCH 22/33 ntfs: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 79a8918..a3e6626 100644
@@ -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

Joe Perches

author

2013-06-14 02:41 UTC #28 lore raw

PATCH 23/33 ocfs2: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 fs/ocfs2/stackglue.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

fs/ocfs2/stackglue.c +4 -4

index 39abf89..cb7ec0b 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:41 UTC #29 lore raw

PATCH 24/33 quota: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 fs/quota/dquot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

fs/quota/dquot.c +3 -3

index b3d1ac9..017eaea 100644
@@ -2577,7 +2577,7 @@ static int do_proc_dqstats(struct ctl_table *table, int write,
 	return proc_dointvec(table, write, buffer, lenp, ppos);
 }
 
-static ctl_table fs_dqstats_table[] = {
+static struct ctl_table fs_dqstats_table[] = {
 	{
 		.procname	= "lookups",
 		.data		= &dqstats.stat[DQST_LOOKUPS],

@@ -2646,7 +2646,7 @@ static ctl_table fs_dqstats_table[] = {
 	{ },
 };
 
-static ctl_table fs_table[] = {
+static struct ctl_table fs_table[] = {
 	{
 		.procname	= "quota",
 		.mode		= 0555,

@@ -2655,7 +2655,7 @@ static ctl_table fs_table[] = {
 	{ },
 };
 
-static ctl_table sys_table[] = {
+static struct ctl_table sys_table[] = {
 	{
 		.procname	= "fs",
 		.mode		= 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Jan Kara

maintainer

2013-06-21 12:59 UTC #30 lore raw

Re: [Trivial PATCH 24/33] quota: Convert use of typedef ctl_table to struct ctl_table

Quoted 1 line · Joe Perches

This typedef is unnecessary and should just be removed.

Thanks. I've merged the patch into my tree and will push it in the next
merge window.

Honza

Quoted 39 lines

Signed-off-by Joe Perches <[email protected]>

---
 fs/quota/dquot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

fs/quota/dquot.c +3 -3

index b3d1ac9..017eaea 100644
@@ -2577,7 +2577,7 @@ static int do_proc_dqstats(struct ctl_table *table, int write,
 	return proc_dointvec(table, write, buffer, lenp, ppos);
 }
 
-static ctl_table fs_dqstats_table[] = {
+static struct ctl_table fs_dqstats_table[] = {
 	{
 		.procname	= "lookups",
 		.data		= &dqstats.stat[DQST_LOOKUPS],

@@ -2646,7 +2646,7 @@ static ctl_table fs_dqstats_table[] = {
 	{ },
 };
 
-static ctl_table fs_table[] = {
+static struct ctl_table fs_table[] = {
 	{
 		.procname	= "quota",
 		.mode		= 0555,

@@ -2655,7 +2655,7 @@ static ctl_table fs_table[] = {
 	{ },
 };
 
-static ctl_table sys_table[] = {
+static struct ctl_table sys_table[] = {
 	{
 		.procname	= "fs",
 		.mode		= 0555,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Signature · 2 lines

Jan Kara <[email protected]>
SUSE Labs, CR

Joe Perches

author

2013-06-14 02:41 UTC #31 lore raw

PATCH 25/33 xfs: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 fs/xfs/xfs_sysctl.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

fs/xfs/xfs_sysctl.c +13 ~~-13~~

index 2801b5c..1743b9f 100644
@@ -25,11 +25,11 @@ static struct ctl_table_header *xfs_table_header;
 #ifdef CONFIG_PROC_FS
 STATIC int
 xfs_stats_clear_proc_handler(
-	ctl_table	*ctl,
-	int		write,
-	void		__user *buffer,
-	size_t		*lenp,
-	loff_t		*ppos)
+	struct ctl_table	*ctl,
+	int			write,
+	void			__user *buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
 {
 	int		c, ret, *valp = ctl->data;
 	__uint32_t	vn_active;

@@ -55,11 +55,11 @@ xfs_stats_clear_proc_handler(
 
 STATIC int
 xfs_panic_mask_proc_handler(
-	ctl_table	*ctl,
-	int		write,
-	void		__user *buffer,
-	size_t		*lenp,
-	loff_t		*ppos)
+	struct ctl_table	*ctl,
+	int			write,
+	void			__user *buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
 {
 	int		ret, *valp = ctl->data;

@@ -74,7 +74,7 @@ xfs_panic_mask_proc_handler(
 }
 #endif /* CONFIG_PROC_FS */
 
-static ctl_table xfs_table[] = {
+static struct ctl_table xfs_table[] = {
 	{
 		.procname	= "irix_sgid_inherit",
 		.data		= &xfs_params.sgid_inherit.val,

@@ -227,7 +227,7 @@ static ctl_table xfs_table[] = {
 	{}
 };
 
-static ctl_table xfs_dir_table[] = {
+static struct ctl_table xfs_dir_table[] = {
 	{
 		.procname	= "xfs",
 		.mode		= 0555,

@@ -236,7 +236,7 @@ static ctl_table xfs_dir_table[] = {
 	{}
 };
 
-static ctl_table xfs_root_table[] = {
+static struct ctl_table xfs_root_table[] = {
 	{
 		.procname	= "fs",
 		.mode		= 0555,

Signature · 6 lines

1.8.1.2.459.gbcd45b4.dirty

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Dave Chinner

Acked-by on v1 25/33

2013-06-14 05:21 UTC #32 lore raw

Re: [Trivial PATCH 25/33] xfs: Convert use of typedef ctl_table to struct ctl_table

Quoted 3 lines · Joe Perches

This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>

Looks fine, Joe.

Acked-by Dave Chinner <[email protected]>

How do you want us to handle this? Push it through the XFS tree or are you going to send it on up yourself?

Cheers,

Dave.

Signature · 2 lines

Dave Chinner
[email protected]

Joe Perches

author

2013-06-14 05:33 UTC #33 lore raw

Re: [Trivial PATCH 25/33] xfs: Convert use of typedef ctl_table to struct ctl_table

Quoted 11 lines · Dave Chinner

Quoted 3 lines · Joe Perches
This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
Looks fine, Joe.
Acked-by Dave Chinner <[email protected]>
How do you want us to handle this? Push it through the XFS tree or are you going to send it on up yourself?

Hi Dave.

I'd prefer you pick it up.

These are all pretty trivial patches, but Jiri
typically doesn't pick them up for months.

I expect I'll have to resend whatever maintainers
don't pick up in 6 months or so.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Dave Chinner

2013-06-14 06:18 UTC #34 lore raw

Re: [Trivial PATCH 25/33] xfs: Convert use of typedef ctl_table to struct ctl_table

Quoted 15 lines · Joe Perches

Quoted 11 lines · Dave Chinner
Quoted 3 lines · Joe Perches
This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
Looks fine, Joe.
Acked-by Dave Chinner <[email protected]>
How do you want us to handle this? Push it through the XFS tree or are you going to send it on up yourself?
Hi Dave.

Quoted 7 lines

I'd prefer you pick it up.
These are all pretty trivial patches, but Jiri
typically doesn't pick them up for months.
I expect I'll have to resend whatever maintainers
don't pick up in 6 months or so.

No worries, I'll add it to my current 3.11 patchset.

Cheers,

Dave.

Signature · 2 lines

Dave Chinner
[email protected]

Ben Myers

Reviewed-by Applied

2013-06-17 22:39 UTC #35 lore raw

Re: [Trivial PATCH 25/33] xfs: Convert use of typedef ctl_table to struct ctl_table

Hey Fellas,

Quoted 18 lines · Dave Chinner

Quoted 17 lines · Joe Perches
Quoted 11 lines · Dave Chinner
Quoted 3 lines · Joe Perches
This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>
Looks fine, Joe.
Acked-by Dave Chinner <[email protected]>
How do you want us to handle this? Push it through the XFS tree or are you going to send it on up yourself?
Hi Dave.
I'd prefer you pick it up.

Quoted 7 lines

Quoted 5 lines
These are all pretty trivial patches, but Jiri
typically doesn't pick them up for months.
I expect I'll have to resend whatever maintainers
don't pick up in 6 months or so.
No worries, I'll add it to my current 3.11 patchset.

Applied it. No need to repost. Thanks Joe!

Reviewed-by Ben Myers <[email protected]>

-Ben

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Joe Perches

author

2013-06-14 02:37 UTC #36 lore raw

PATCH 26/33 fs: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index d3feea1..c9fa3bd 100644
@@ -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

index c3f44e7..6c8e90d 100644
@@ -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

index 0cff4434..4d2dfb5 100644
@@ -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

index cd4d87a..7cc4cdf 100644
@@ -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/inode.c +1 -1

index 00b804e..8bd0abc 100644
@@ -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

Joe Perches

author

2013-06-14 02:42 UTC #37 lore raw

PATCH 27/33 key: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index 4dfde11..3b98ce0 100644
@@ -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

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:37 UTC #38 lore raw

PATCH 28/33 ipv6: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 include/net/ipv6.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

include/net/ipv6.h +2 -2

index ab47582..5fe5649 100644
@@ -859,8 +859,8 @@ static inline int snmp6_unregister_dev(struct inet6_dev *idev) { return 0; }
 #endif
 
 #ifdef CONFIG_SYSCTL
-extern ctl_table ipv6_route_table_template[];
-extern ctl_table ipv6_icmp_table_template[];
+extern struct ctl_table ipv6_route_table_template[];
+extern struct ctl_table ipv6_icmp_table_template[];
 
 extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
 extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

David Miller

maintainer Applied

2013-06-20 06:18 UTC #39 lore raw

Re: [Trivial PATCH 28/33] ipv6: Convert use of typedef ctl_table to struct ctl_table

From: Joe Perches <[email protected]>
Date: Thu, 13 Jun 2013 19:37:53 -0700

Quoted 3 lines

This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>

Applied.

Joe Perches

author

2013-06-14 02:37 UTC #40 lore raw

PATCH 29/33 ndisc: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 include/net/ndisc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/net/ndisc.h +1 -1

index 745bf74..949d775 100644
@@ -230,7 +230,7 @@ extern int 			ndisc_ifinfo_sysctl_change(struct ctl_table *ctl,
 							   void __user *buffer,
 							   size_t *lenp,
 							   loff_t *ppos);
-int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
+int ndisc_ifinfo_sysctl_strategy(struct ctl_table *ctl,
 				 void __user *oldval, size_t __user *oldlenp,
 				 void __user *newval, size_t newlen);
 #endif

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

David Miller

maintainer Applied

2013-06-20 06:18 UTC #41 lore raw

Re: [Trivial PATCH 29/33] ndisc: Convert use of typedef ctl_table to struct ctl_table

From: Joe Perches <[email protected]>
Date: Thu, 13 Jun 2013 19:37:54 -0700

Quoted 3 lines

This typedef is unnecessary and should just be removed.
Signed-off-by Joe Perches <[email protected]>

Applied.

Joe Perches

author

2013-06-14 02:42 UTC #42 lore raw

PATCH 30/33 ipc: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 ipc/ipc_sysctl.c | 14 +++++++-------
 ipc/mq_sysctl.c  | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

ipc/ipc_sysctl.c +7 -7

index 130dfec..27fab60 100644
@@ -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

index 383d638..ee514bb 100644
@@ -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,

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Joe Perches

author

2013-06-14 02:42 UTC #43 lore raw

PATCH 31/33 sysctl: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This 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

index fb90f7c..aa357a2 100644
@@ -193,7 +193,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

index 4f69f9a..09af144 100644
@@ -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

Joe Perches

author

2013-06-14 02:42 UTC #44 lore raw

PATCH 32/33 mm: Convert use of typedef ctl_table to struct ctl_table

In reply to Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>

---
 mm/page-writeback.c |  2 +-
 mm/page_alloc.c     | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

mm/page-writeback.c +1 -1

index 4514ad7..82d1b74 100644
@@ -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

index 18102e1..c0afdb7 100644
@@ -3244,7 +3244,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)
 {

@@ -5591,8 +5591,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)

@@ -5601,7 +5602,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;

@@ -5617,7 +5618,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;

@@ -5643,7 +5644,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);

@@ -5656,7 +5657,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>

Joe Perches

author

2013-06-14 02:43 UTC #45 lore raw

PATCH 33/33 security: keys: Convert use of typedef ctl_table to struct ctl_table

In reply to 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(-)

security/keys/sysctl.c +1 -1

index ee32d18..9a9df6f 100644
@@ -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