From 566c9f8ff5fe60dacb02f76664ad0fe957b770be Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 26 Jul 2008 03:46:43 -0400
Subject: [PATCH] --- yaml --- r: 106382 b: refs/heads/master c:
 3f8206d496e9e9495afb1d4e70d29712b4d403c9 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfsd/nfsctl.c       | 1 +
 trunk/fs/ubifs/file.c        | 1 +
 trunk/include/linux/fs.h     | 2 +-
 trunk/include/linux/nfs_fs.h | 1 -
 trunk/kernel/cgroup.c        | 1 +
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85d2b61ee2cf..62275627cc7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 964bd183624c03680796b63b4ab97ee3905a806a
+refs/heads/master: 3f8206d496e9e9495afb1d4e70d29712b4d403c9
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 1955a2702e60..c53e65f8f3a2 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/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/trunk/fs/ubifs/file.c b/trunk/fs/ubifs/file.c
index 005a3b854d96..8565e586e533 100644
--- a/trunk/fs/ubifs/file.c
+++ b/trunk/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/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 7676fa1c20ae..8252b045e624 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index f08f9ca602af..78a5922a2f11 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/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/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 89bd6fb7894f..657f8f8d93a5 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/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>