Commit e979196e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] don't include <linux/sysctl.h> in <linux/security.h>

security.h gets pulled in in lots of places, so use forward declarations
for struct ctl_table instead of pulling sysctl in everywhere.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 838eb75e
...@@ -27,13 +27,14 @@ ...@@ -27,13 +27,14 @@
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/resource.h> #include <linux/resource.h>
#include <linux/sem.h> #include <linux/sem.h>
#include <linux/sysctl.h>
#include <linux/shm.h> #include <linux/shm.h>
#include <linux/msg.h> #include <linux/msg.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netlink.h> #include <linux/netlink.h>
struct ctl_table;
/* /*
* These functions are in security/capability.c and are used * These functions are in security/capability.c and are used
* as the default capabilities functions * as the default capabilities functions
...@@ -1029,7 +1030,7 @@ struct security_operations { ...@@ -1029,7 +1030,7 @@ struct security_operations {
kernel_cap_t * inheritable, kernel_cap_t * inheritable,
kernel_cap_t * permitted); kernel_cap_t * permitted);
int (*acct) (struct file * file); int (*acct) (struct file * file);
int (*sysctl) (ctl_table * table, int op); int (*sysctl) (struct ctl_table * table, int op);
int (*capable) (struct task_struct * tsk, int cap); int (*capable) (struct task_struct * tsk, int cap);
int (*quotactl) (int cmds, int type, int id, struct super_block * sb); int (*quotactl) (int cmds, int type, int id, struct super_block * sb);
int (*quota_on) (struct file * f); int (*quota_on) (struct file * f);
...@@ -1268,7 +1269,7 @@ static inline int security_acct (struct file *file) ...@@ -1268,7 +1269,7 @@ static inline int security_acct (struct file *file)
return security_ops->acct (file); return security_ops->acct (file);
} }
static inline int security_sysctl(ctl_table * table, int op) static inline int security_sysctl(struct ctl_table *table, int op)
{ {
return security_ops->sysctl(table, op); return security_ops->sysctl(table, op);
} }
...@@ -1940,7 +1941,7 @@ static inline int security_acct (struct file *file) ...@@ -1940,7 +1941,7 @@ static inline int security_acct (struct file *file)
return 0; return 0;
} }
static inline int security_sysctl(ctl_table * table, int op) static inline int security_sysctl(struct ctl_table *table, int op)
{ {
return 0; return 0;
} }
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
#include <net/ipv6.h> #include <net/ipv6.h>
#include <linux/hugetlb.h> #include <linux/hugetlb.h>
#include <linux/personality.h> #include <linux/personality.h>
#include <linux/sysctl.h>
#include "avc.h" #include "avc.h"
#include "objsec.h" #include "objsec.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment