Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5c5928b authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

ipc: convert use of typedef ctl_table to struct ctl_table 



This typedef is unnecessary and should just be removed.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d6f50c95

ipc/ipc_sysctl.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/msg.h>

#include <linux/msg.h>

#include "util.h"

#include "util.h"





static void *get_ipc(ctl_table *table)

static void *get_ipc(struct ctl_table *table)

{

{

	char *which = table->data;

	char *which = table->data;

	struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;

	struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@@ -27,7 +27,7 @@ static void *get_ipc(ctl_table *table) 
}

}





#ifdef CONFIG_PROC_SYSCTL

#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)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table ipc_table;

	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);

	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)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table ipc_table;

	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);

	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)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ipc_namespace *ns = current->nsproxy->ipc_ns;

	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;

	return err;

}

}





static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,

static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,

	void __user *buffer, size_t *lenp, loff_t *ppos)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table ipc_table;

	struct ctl_table ipc_table;
@@ -85,7 +85,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write, 
	return rc;

	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)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table ipc_table;

	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)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table ipc_table;

	struct ctl_table ipc_table;

ipc/mq_sysctl.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/sysctl.h>

#include <linux/sysctl.h>





#ifdef CONFIG_PROC_SYSCTL

#ifdef CONFIG_PROC_SYSCTL

static void *get_mq(ctl_table *table)

static void *get_mq(struct ctl_table *table)

{

{

	char *which = table->data;

	char *which = table->data;

	struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;

	struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@@ -22,7 +22,7 @@ static void *get_mq(ctl_table *table) 
	return which;

	return which;

}

}





static int proc_mq_dointvec(ctl_table *table, int write,

static int proc_mq_dointvec(struct ctl_table *table, int write,

			    void __user *buffer, size_t *lenp, loff_t *ppos)

			    void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table mq_table;

	struct ctl_table mq_table;
@@ -32,7 +32,7 @@ static int proc_mq_dointvec(ctl_table *table, int write, 
	return proc_dointvec(&mq_table, write, buffer, lenp, ppos);

	return proc_dointvec(&mq_table, write, buffer, lenp, ppos);

}

}





static int proc_mq_dointvec_minmax(ctl_table *table, int write,

static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,

	void __user *buffer, size_t *lenp, loff_t *ppos)

	void __user *buffer, size_t *lenp, loff_t *ppos)

{

{

	struct ctl_table mq_table;

	struct ctl_table mq_table;
@@ -53,7 +53,7 @@ static int msg_max_limit_max = HARD_MSGMAX; 
static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;

static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;

static int msg_maxsize_limit_max = HARD_MSGSIZEMAX;

static int msg_maxsize_limit_max = HARD_MSGSIZEMAX;





static ctl_table mq_sysctls[] = {

static struct ctl_table mq_sysctls[] = {

	{

	{

		.procname	= "queues_max",

		.procname	= "queues_max",

		.data		= &init_ipc_ns.mq_queues_max,

		.data		= &init_ipc_ns.mq_queues_max,
@@ -100,7 +100,7 @@ static ctl_table mq_sysctls[] = { 
	{}

	{}

};

};





static ctl_table mq_sysctl_dir[] = {

static struct ctl_table mq_sysctl_dir[] = {

	{

	{

		.procname	= "mqueue",

		.procname	= "mqueue",

		.mode		= 0555,

		.mode		= 0555,
@@ -109,7 +109,7 @@ static ctl_table mq_sysctl_dir[] = { 
	{}

	{}

};

};





static ctl_table mq_sysctl_root[] = {

static struct ctl_table mq_sysctl_root[] = {

	{

	{

		.procname	= "fs",

		.procname	= "fs",

		.mode		= 0555,

		.mode		= 0555,