From 0651742dc53ca10341e86beb5373cd52ee2c4372 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Tue, 4 Jan 2011 17:37:15 -0500
Subject: [PATCH] --- yaml --- r: 231162 b: refs/heads/master c:
 2ca72e17e5acb1052c35c9faba609c2289ce7a92 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/{include/linux/nfs4_acl.h => fs/nfsd/acl.h}     | 0
 trunk/{include/linux/nfsd_idmap.h => fs/nfsd/idmap.h} | 0
 trunk/fs/nfsd/nfs4acl.c                               | 2 +-
 trunk/fs/nfsd/nfs4idmap.c                             | 2 +-
 trunk/fs/nfsd/nfs4xdr.c                               | 5 +++--
 trunk/fs/nfsd/nfsctl.c                                | 2 +-
 trunk/fs/nfsd/vfs.c                                   | 4 ++--
 8 files changed, 9 insertions(+), 8 deletions(-)
 rename trunk/{include/linux/nfs4_acl.h => fs/nfsd/acl.h} (100%)
 rename trunk/{include/linux/nfsd_idmap.h => fs/nfsd/idmap.h} (100%)

diff --git a/[refs] b/[refs]
index 41e98f0cd69d..c6860bb86708 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6af99ec1b261e21219d5eba99e3af48fc6c32d4
+refs/heads/master: 2ca72e17e5acb1052c35c9faba609c2289ce7a92
diff --git a/trunk/include/linux/nfs4_acl.h b/trunk/fs/nfsd/acl.h
similarity index 100%
rename from trunk/include/linux/nfs4_acl.h
rename to trunk/fs/nfsd/acl.h
diff --git a/trunk/include/linux/nfsd_idmap.h b/trunk/fs/nfsd/idmap.h
similarity index 100%
rename from trunk/include/linux/nfsd_idmap.h
rename to trunk/fs/nfsd/idmap.h
diff --git a/trunk/fs/nfsd/nfs4acl.c b/trunk/fs/nfsd/nfs4acl.c
index e48052615159..ad88f1c0a4c3 100644
--- a/trunk/fs/nfsd/nfs4acl.c
+++ b/trunk/fs/nfsd/nfs4acl.c
@@ -36,7 +36,7 @@
 
 #include <linux/slab.h>
 #include <linux/nfs_fs.h>
-#include <linux/nfs4_acl.h>
+#include "acl.h"
 
 
 /* mode bit translations: */
diff --git a/trunk/fs/nfsd/nfs4idmap.c b/trunk/fs/nfsd/nfs4idmap.c
index 844960fd0395..cbd599732765 100644
--- a/trunk/fs/nfsd/nfs4idmap.c
+++ b/trunk/fs/nfsd/nfs4idmap.c
@@ -33,10 +33,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/nfsd_idmap.h>
 #include <linux/seq_file.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include "idmap.h"
 
 /*
  * Cache entry
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index 364aae7d5998..2a0814d0ab1a 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -44,13 +44,14 @@
 #include <linux/namei.h>
 #include <linux/statfs.h>
 #include <linux/utsname.h>
-#include <linux/nfsd_idmap.h>
-#include <linux/nfs4_acl.h>
 #include <linux/sunrpc/svcauth_gss.h>
 
+#include "idmap.h"
+#include "acl.h"
 #include "xdr4.h"
 #include "vfs.h"
 
+
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
 /*
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 6840ec3ceecf..33b3e2b06779 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -8,12 +8,12 @@
 #include <linux/namei.h>
 #include <linux/ctype.h>
 
-#include <linux/nfsd_idmap.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/lockd/lockd.h>
 #include <linux/sunrpc/clnt.h>
 
+#include "idmap.h"
 #include "nfsd.h"
 #include "cache.h"
 
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index 6a3af2ff3afe..b991125ce4a5 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -35,8 +35,8 @@
 #endif /* CONFIG_NFSD_V3 */
 
 #ifdef CONFIG_NFSD_V4
-#include <linux/nfs4_acl.h>
-#include <linux/nfsd_idmap.h>
+#include "acl.h"
+#include "idmap.h"
 #endif /* CONFIG_NFSD_V4 */
 
 #include "nfsd.h"