[PATCH] get rid of indirect users of namei.h

fs.h needs path.h, not namei.h; nfs_fs.h doesn't need it at all.
Several places in the tree needed direct include.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 1955a2702e60a473cad46549d2e58298c5c767c7..c53e65f8f3a2b460d6c01424094b29c8082843a4 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -12,6 +12,7 @@
 #include <linux/time.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/fcntl.h>
 #include <linux/net.h>
 #include <linux/in.h>

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 005a3b854d96ad120098f750e0ef17d540a4abe1..8565e586e533bdafae604abfda4d06b369025bb9 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -53,6 +53,7 @@
 
 #include "ubifs.h"
 #include <linux/mount.h>
+#include <linux/namei.h>
 
 static int read_block(struct inode *inode, void *addr, unsigned int block,
                      struct ubifs_data_node *dn)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7676fa1c20ae270ee23dc53eb58171de02432beb..8252b045e62489523452bdec777d8bd630e20cfc 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -279,7 +279,7 @@ extern int dir_notify_enable;
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 #include <linux/dcache.h>
-#include <linux/namei.h>
+#include <linux/path.h>
 #include <linux/stat.h>
 #include <linux/cache.h>
 #include <linux/kobject.h>

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index f08f9ca602afef18a20850742f13a37266c007ea..78a5922a2f111dc7d08b8d7d5bef59c2511cef15 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -42,7 +42,6 @@
 #include <linux/in.h>
 #include <linux/kref.h>
 #include <linux/mm.h>
-#include <linux/namei.h>
 #include <linux/pagemap.h>
 #include <linux/rbtree.h>
 #include <linux/rwsem.h>

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 89bd6fb7894fc87f4c2505894daf0241862fa3af..657f8f8d93a5fa947e79d0b8567a9c5288f425d9 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -45,6 +45,7 @@
 #include <linux/delayacct.h>
 #include <linux/cgroupstats.h>
 #include <linux/hash.h>
+#include <linux/namei.h>
 
 #include <asm/atomic.h>