diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-12-07 13:06:11 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:13 -0500 |
commit | d10577a8d86a0c735488d66d32289a6d66bcfa20 (patch) | |
tree | a38b3606fb863064eb89166f6a3115f7c5eccfd7 | |
parent | be08d6d260b6e7eb346162a1081cdf5f94fda569 (diff) |
vfs: trim includes a bit
[folded fix for missing magic.h from Tetsuo Handa]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/namespace.c | 25 | ||||
-rw-r--r-- | fs/proc/namespaces.c | 1 | ||||
-rw-r--r-- | security/tomoyo/realpath.c | 1 |
3 files changed, 7 insertions, 20 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d4016f911ef9..773435ca300d 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -9,30 +9,17 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/syscalls.h> | 11 | #include <linux/syscalls.h> |
12 | #include <linux/slab.h> | 12 | #include <linux/export.h> |
13 | #include <linux/sched.h> | ||
14 | #include <linux/spinlock.h> | ||
15 | #include <linux/percpu.h> | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/acct.h> | ||
19 | #include <linux/capability.h> | 13 | #include <linux/capability.h> |
20 | #include <linux/cpumask.h> | ||
21 | #include <linux/module.h> | ||
22 | #include <linux/sysfs.h> | ||
23 | #include <linux/seq_file.h> | ||
24 | #include <linux/mnt_namespace.h> | 14 | #include <linux/mnt_namespace.h> |
25 | #include <linux/namei.h> | 15 | #include <linux/namei.h> |
26 | #include <linux/nsproxy.h> | ||
27 | #include <linux/security.h> | 16 | #include <linux/security.h> |
28 | #include <linux/mount.h> | ||
29 | #include <linux/ramfs.h> | ||
30 | #include <linux/log2.h> | ||
31 | #include <linux/idr.h> | 17 | #include <linux/idr.h> |
32 | #include <linux/fs_struct.h> | 18 | #include <linux/acct.h> /* acct_auto_close_mnt */ |
33 | #include <linux/fsnotify.h> | 19 | #include <linux/ramfs.h> /* init_rootfs */ |
34 | #include <asm/uaccess.h> | 20 | #include <linux/fs_struct.h> /* get_fs_root et.al. */ |
35 | #include <asm/unistd.h> | 21 | #include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */ |
22 | #include <linux/uaccess.h> | ||
36 | #include "pnode.h" | 23 | #include "pnode.h" |
37 | #include "internal.h" | 24 | #include "internal.h" |
38 | 25 | ||
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index be177f702acb..27da860115c6 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/file.h> | 9 | #include <linux/file.h> |
10 | #include <linux/utsname.h> | 10 | #include <linux/utsname.h> |
11 | #include <net/net_namespace.h> | 11 | #include <net/net_namespace.h> |
12 | #include <linux/mnt_namespace.h> | ||
13 | #include <linux/ipc_namespace.h> | 12 | #include <linux/ipc_namespace.h> |
14 | #include <linux/pid_namespace.h> | 13 | #include <linux/pid_namespace.h> |
15 | #include "internal.h" | 14 | #include "internal.h" |
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index 2cb5db589c9d..80a09c37cac8 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "common.h" | 7 | #include "common.h" |
8 | #include <linux/magic.h> | ||
8 | 9 | ||
9 | /** | 10 | /** |
10 | * tomoyo_encode2 - Encode binary string to ascii string. | 11 | * tomoyo_encode2 - Encode binary string to ascii string. |