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) | |
| download | linux-stable-d10577a8d86a0c735488d66d32289a6d66bcfa20.tar.gz linux-stable-d10577a8d86a0c735488d66d32289a6d66bcfa20.tar.bz2 linux-stable-d10577a8d86a0c735488d66d32289a6d66bcfa20.zip | |
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 @@ */ #include <linux/syscalls.h> -#include <linux/slab.h> -#include <linux/sched.h> -#include <linux/spinlock.h> -#include <linux/percpu.h> -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/acct.h> +#include <linux/export.h> #include <linux/capability.h> -#include <linux/cpumask.h> -#include <linux/module.h> -#include <linux/sysfs.h> -#include <linux/seq_file.h> #include <linux/mnt_namespace.h> #include <linux/namei.h> -#include <linux/nsproxy.h> #include <linux/security.h> -#include <linux/mount.h> -#include <linux/ramfs.h> -#include <linux/log2.h> #include <linux/idr.h> -#include <linux/fs_struct.h> -#include <linux/fsnotify.h> -#include <asm/uaccess.h> -#include <asm/unistd.h> +#include <linux/acct.h> /* acct_auto_close_mnt */ +#include <linux/ramfs.h> /* init_rootfs */ +#include <linux/fs_struct.h> /* get_fs_root et.al. */ +#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */ +#include <linux/uaccess.h> #include "pnode.h" #include "internal.h" 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 @@ #include <linux/file.h> #include <linux/utsname.h> #include <net/net_namespace.h> -#include <linux/mnt_namespace.h> #include <linux/ipc_namespace.h> #include <linux/pid_namespace.h> #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 @@ */ #include "common.h" +#include <linux/magic.h> /** * tomoyo_encode2 - Encode binary string to ascii string. |