Skip to contentSkip to conversation

treewide: Convert use of typedef ctl_table to struct ctl_table

PATCH Applied Joe Perches 5 participants 30 messages Oct 22, 2013 – Nov 7, 2013

Subsystems (24)
Memory management Arm (32-bit) VFS SCSI +20 more subsystems
lore
Share & tools
lore

Joe Perches

author
#0 lore raw

cover treewide: Convert use of typedef ctl_table to struct ctl_table

Joe Perches (24):
arm: Convert use of typedef ctl_table to struct ctl_table
ia64: Convert use of typedef ctl_table to struct ctl_table
s390: 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
infiniband: Convert use of typedef ctl_table to struct ctl_table
md: 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
ocfs2: Convert use of typedef ctl_table to struct ctl_table
proc: 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
kernel: 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/ia64/kernel/crash.c           |  4 +--
 arch/ia64/kernel/perfmon.c         |  6 ++---
 arch/s390/appldata/appldata_base.c | 10 ++++----
 arch/s390/kernel/debug.c           |  2 +-
 arch/s390/mm/cmm.c                 |  8 +++---
 arch/tile/kernel/proc.c            |  4 +--
 drivers/cdrom/cdrom.c              | 10 ++++----
 drivers/char/random.c              |  4 +--
 drivers/infiniband/core/ucma.c     |  2 +-
 drivers/md/md.c                    |  6 ++---
 drivers/parport/procfs.c           | 52 ++++++++++++++++++--------------------
 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/proc/proc_sysctl.c              |  2 +-
 include/linux/key.h                |  2 +-
 ipc/ipc_sysctl.c                   | 14 +++++-----
 ipc/mq_sysctl.c                    | 10 ++++----
 kernel/sysctl.c                    |  2 +-
 kernel/utsname_sysctl.c            |  6 ++---
 mm/page-writeback.c                |  2 +-
 mm/page_alloc.c                    | 12 ++++-----
 security/keys/sysctl.c             |  2 +-
 35 files changed, 111 insertions(+), 113 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
author
#1 lore raw

PATCH 1/24 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
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
author
#2 lore raw

PATCH 2/24 ia64: 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
author
#3 lore raw

PATCH 3/24 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 | 10 +++++-----
 arch/s390/kernel/debug.c           |  2 +-
 arch/s390/mm/cmm.c                 |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
arch/s390/appldata/appldata_base.c +5 -5
index 87a2209..baff85e 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,7 +201,7 @@ 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,
+appldata_timer_handler(struct ctl_table *ctl, int write,
 			   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	int len;

@@ -243,7 +243,7 @@ out:
  * current timer interval.
  */
 static int
-appldata_interval_handler(ctl_table *ctl, int write,
+appldata_interval_handler(struct ctl_table *ctl, int write,
 			   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	int len, interval;

@@ -286,7 +286,7 @@ out:
  * monitoring (0 = not in process, 1 = in process)
  */
 static int
-appldata_generic_handler(ctl_table *ctl, int write,
+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;
arch/s390/kernel/debug.c +1 -1
index f1279dc..d98b888 100644
@@ -889,7 +889,7 @@ static int debug_active=1;
  * if debug_active is already off
  */
 static int
-s390dbf_procactive(ctl_table *table, int write,
+s390dbf_procactive(struct ctl_table *table, int write,
                      void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	if (!write || debug_stoppable || !debug_active)
arch/s390/mm/cmm.c +4 -4
index 9d84a1f..61172c4 100644
@@ -253,8 +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,
-			     size_t *lenp, loff_t *ppos)
+static int cmm_pages_handler(struct ctl_table *ctl, int write,
+			     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	char buf[16], *p;
 	long nr;

@@ -293,8 +293,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,
-			       size_t *lenp, loff_t *ppos)
+static int cmm_timeout_handler(struct ctl_table *ctl, int write,
+			       void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	char buf[64], *p;
 	long nr, seconds;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Applied
#4 lore raw

Re: [PATCH 03/24] s390: Convert use of typedef ctl_table to struct ctl_table

Quoted 8 lines · Joe Perches

This typedef is unnecessary and should just be removed.

Signed-off-by Joe Perches <[email protected]>
---
 arch/s390/appldata/appldata_base.c | 10 +++++-----
 arch/s390/kernel/debug.c           |  2 +-
 arch/s390/mm/cmm.c                 |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

Applied, thanks.

author
#5 lore raw

PATCH 4/24 tile: 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 681100c..6829a95 100644
@@ -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
author
#6 lore raw

PATCH 5/24 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
author
#7 lore raw

PATCH 6/24 random: 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/random.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/random.c +2 -2
index 6f20317..91863d1 100644
@@ -1508,10 +1508,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
author
#8 lore raw

PATCH 7/24 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 b0f189b..3f93093 100644
@@ -57,7 +57,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 static unsigned int max_backlog = 1024;
 
 static struct ctl_table_header *ucma_ctl_table_hdr;
-static ctl_table ucma_ctl_table[] = {
+static struct ctl_table ucma_ctl_table[] = {
 	{
 		.procname	= "max_backlog",
 		.data		= &max_backlog,
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
author
#9 lore raw

PATCH 8/24 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 8a0d762..7b57639 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
Applied
#10 lore raw

Re: [PATCH 08/24] md: Convert use of typedef ctl_table to struct ctl_table

Quoted 30 lines · On Tue, 22 Oct 2013 15:29:51 -0700 Joe Perches <[email protected]> wrote:

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 +2 -2
index 8a0d762..7b57639 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,

drivers/md/md.c static ctl_table raid_dir_table[] = { · line 146

Quoted 8 lines
drivers/md/md.c +1 -1
@@ -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,

Applied, thanks.

NeilBrown

author
#11 lore raw

PATCH 9/24 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 | 52 +++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)
drivers/parport/procfs.c +25 -27
index 92ed045..3dac6a7 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,7 +138,7 @@ 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,
+static int do_hardware_irq(struct ctl_table *table, int write,
 			    void __user *result,
 			    size_t *lenp, loff_t *ppos)
 {

@@ -166,9 +166,8 @@ 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 +193,8 @@ 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 +253,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 +367,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 +420,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
author
#12 lore raw

PATCH 10/24 scsi: 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
author
#13 lore raw

PATCH 11/24 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
author
#14 lore raw

PATCH 12/24 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
author
#15 lore raw

PATCH 13/24 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 10d6c41..140cc67 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
author
#16 lore raw

PATCH 14/24 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
author
#17 lore raw

PATCH 15/24 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 60f954a..cf4d837 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
author
#18 lore raw

PATCH 16/24 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
author
#19 lore raw

PATCH 17/24 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
maintainer Acked-by on v1 17/24
#20 lore raw

Re: [PATCH 17/24] ocfs2: 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 Joel Becker <[email protected]>
Quoted 47 lines
---
 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
Signature · 6 lines
Life's Little Instruction Book #451

	"Don't be afraid to say, 'I'm sorry.'"

			http://www.jlbec.org/
			jlbec at evilplan.org
author
#21 lore raw

PATCH 18/24 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]>
---
 fs/proc/proc_sysctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/proc/proc_sysctl.c +1 -1
index 7129046..f92d5dd 100644
@@ -632,7 +632,7 @@ out:
 	return ret;
 }
 
-static int scan(struct ctl_table_header *head, ctl_table *table,
+static int scan(struct ctl_table_header *head, struct ctl_table *table,
 		unsigned long *pos, struct file *file,
 		struct dir_context *ctx)
 {
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
author
#22 lore raw

PATCH 19/24 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 59c06e5..7c2f779 100644
@@ -181,7 +181,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 9fd702f..d9fba09 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 473e09d..46a221c 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 abdd15a..bc477d6 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 b33ba8e..00653a4 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
author
#23 lore raw

PATCH 20/24 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
author
#24 lore raw

PATCH 21/24 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
author
#25 lore raw

PATCH 22/24 kernel: 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 bcb35ab..a083aeb 100644
@@ -192,7 +192,7 @@ static int proc_dostring_coredump(struct ctl_table *table, int write,
 /* Note: sysrq code uses it's own private copy */
 static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
 
-static int sysrq_sysctl_handler(ctl_table *table, int write,
+static int sysrq_sysctl_handler(struct ctl_table *table, int write,
 				void __user *buffer, size_t *lenp,
 				loff_t *ppos)
 {
kernel/utsname_sysctl.c +3 -3
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
author
#26 lore raw

PATCH 23/24 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     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
mm/page-writeback.c +1 -1
index f5236f8..bd0a03f 100644
@@ -1687,7 +1687,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
index c1cf5f8..5a9a0d5 100644
@@ -3314,7 +3314,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)
 {

@@ -5698,7 +5698,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)
 {
 	proc_dointvec(table, write, buffer, length, ppos);

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

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

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

@@ -5765,7 +5765,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>
author
#27 lore raw

PATCH 24/24 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
#28 lore raw
In reply to Joe Perches
Quoted 17 lines · Joe Perches

Joe Perches (24):
arm: Convert use of typedef ctl_table to struct ctl_table
ia64: Convert use of typedef ctl_table to struct ctl_table
s390: 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
infiniband: Convert use of typedef ctl_table to struct ctl_table
md: 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

Quoted 8 lines

ocfs2: Convert use of typedef ctl_table to struct ctl_table
proc: 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
kernel: 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

After all this work, why not go ahead and remove the typedef? That way people won't add more users of this abomination.

David Daney

Quoted 38 lines
  arch/arm/kernel/isa.c              |  6 ++---
  arch/ia64/kernel/crash.c           |  4 +--
  arch/ia64/kernel/perfmon.c         |  6 ++---
  arch/s390/appldata/appldata_base.c | 10 ++++----
  arch/s390/kernel/debug.c           |  2 +-
  arch/s390/mm/cmm.c                 |  8 +++---
  arch/tile/kernel/proc.c            |  4 +--
  drivers/cdrom/cdrom.c              | 10 ++++----
  drivers/char/random.c              |  4 +--
  drivers/infiniband/core/ucma.c     |  2 +-
  drivers/md/md.c                    |  6 ++---
  drivers/parport/procfs.c           | 52 ++++++++++++++++++--------------------
  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/proc/proc_sysctl.c              |  2 +-
  include/linux/key.h                |  2 +-
  ipc/ipc_sysctl.c                   | 14 +++++-----
  ipc/mq_sysctl.c                    | 10 ++++----
  kernel/sysctl.c                    |  2 +-
  kernel/utsname_sysctl.c            |  6 ++---
  mm/page-writeback.c                |  2 +-
  mm/page_alloc.c                    | 12 ++++-----
  security/keys/sysctl.c             |  2 +-
  35 files changed, 111 insertions(+), 113 deletions(-)